diff --git a/samples/demo-authorizationserver/src/main/resources/keystore.p12 b/samples/demo-authorizationserver/src/main/resources/keystore.p12
index b6fb584a..ec191faf 100644
Binary files a/samples/demo-authorizationserver/src/main/resources/keystore.p12 and b/samples/demo-authorizationserver/src/main/resources/keystore.p12 differ
diff --git a/samples/demo-client/src/main/resources/keystore-self-signed.p12 b/samples/demo-client/src/main/resources/keystore-self-signed.p12
index 6425b67a..2fa1f852 100644
Binary files a/samples/demo-client/src/main/resources/keystore-self-signed.p12 and b/samples/demo-client/src/main/resources/keystore-self-signed.p12 differ
diff --git a/samples/demo-client/src/main/resources/keystore.p12 b/samples/demo-client/src/main/resources/keystore.p12
index 2a644abb..1cbe2c4d 100644
Binary files a/samples/demo-client/src/main/resources/keystore.p12 and b/samples/demo-client/src/main/resources/keystore.p12 differ
diff --git a/samples/messages-resource/src/main/resources/keystore.p12 b/samples/messages-resource/src/main/resources/keystore.p12
index 15b70118..6b0bfd81 100644
Binary files a/samples/messages-resource/src/main/resources/keystore.p12 and b/samples/messages-resource/src/main/resources/keystore.p12 differ
diff --git a/samples/x509-certificate-generator/generated/spring-samples-ca-keystore.p12 b/samples/x509-certificate-generator/generated/spring-samples-ca-keystore.p12
index 7b692c09..deeabfa2 100644
Binary files a/samples/x509-certificate-generator/generated/spring-samples-ca-keystore.p12 and b/samples/x509-certificate-generator/generated/spring-samples-ca-keystore.p12 differ
diff --git a/samples/x509-certificate-generator/generated/spring-samples-ca.pem b/samples/x509-certificate-generator/generated/spring-samples-ca.pem
index decaff73..4a0e5135 100644
--- a/samples/x509-certificate-generator/generated/spring-samples-ca.pem
+++ b/samples/x509-certificate-generator/generated/spring-samples-ca.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEBjCCAu6gAwIBAgIIpMf6rDm8a1IwDQYJKoZIhvcNAQELBQAwWzELMAkGA1UE
+MIIEBjCCAu6gAwIBAgII0eIWPvLayiMwDQYJKoZIhvcNAQELBQAwWzELMAkGA1UE
 BhMCVVMxDzANBgNVBAoTBlNwcmluZzEXMBUGA1UECxMOU3ByaW5nIFNhbXBsZXMx
-IjAgBgNVBAMTGXNwcmluZy1zYW1wbGVzLXRydXN0ZWQtY2EwHhcNMjQwNDAyMTAy
-MDE2WhcNMjUwNDAyMTAyMDE2WjBTMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGU3By
+IjAgBgNVBAMTGXNwcmluZy1zYW1wbGVzLXRydXN0ZWQtY2EwHhcNMjUwNzA3MjMw
+MjU4WhcNMjYwNzA3MjMwMjU4WjBTMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGU3By
 aW5nMRcwFQYDVQQLEw5TcHJpbmcgU2FtcGxlczEaMBgGA1UEAxMRc3ByaW5nLXNh
-bXBsZXMtY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgOMG5PXY+
-jOUp07/wltx0bPN4JiFhCcK35fE6nzxBQJ/gtR6djAjrEOtJh5uJB8k7kF9bKMU3
-Eb3kBwO/vR6pemKVUMFA1wyMthnrR36D+Q2MwhWG6BGGTkQ9GSBv6JSWZtQeJBHT
-P6XFsbtMySFSamqdTnXjspv4hVAs/gNYyHoAfR67I0L1mSdlnHo2R48+eYA+7Kqt
-d4IuW/nJY4ZCYNksOEemhY2ck7VGmd87PgwibXLVmbUob7UOdn4j7x4rqUgaHl83
-eBnu6W+xYTM1Cjc/jITMf3dXejEr9/68CNIxlnB02cZnr1JE6Bw6yIFMcrNaCYOd
-ODt4zaViZBzRAgMBAAGjgdUwgdIwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8B
-Af8EBAMCAQYwgYwGA1UdIwSBhDCBgYAUmJZhDGV3S/o2ifi1PP+NK/oEnO6hX6Rd
+bXBsZXMtY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWT1gNN3pv
+bLYNBfLEp/eS7VslPSQe8/wphA86UjuuYtNOM2gSiDcYoVsZZxgqCyL75emMeuzw
+f5EVucduKhc3U0un127nn/wdlhXUwzABqwxc79ZBDiE6ofFToZfPQMGqMjLcOhzQ
+KjoNuB3d68d7SqfG2VviEEXVXYFeuloPRsnlMbV5uVZ5enjIatHtLdAJossH2JMi
+9aKhOKqm9WFoOSoTAo52FcI8Ie52F6mHezDVDGZZlqgkWFlrlm1NAn5U3YfaEbSC
+C5h46mpQ9vSZRfNKBO6r015KXRItqKK+BcBICEVx/gHdb8FZrdca3C4jxd0kSsZ9
+144cf+YOVTvFAgMBAAGjgdUwgdIwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8B
+Af8EBAMCAQYwgYwGA1UdIwSBhDCBgYAU/TM8OsIIwtElmHTMFYnTdfbfxmqhX6Rd
 MFsxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZTcHJpbmcxFzAVBgNVBAsTDlNwcmlu
-ZyBTYW1wbGVzMSIwIAYDVQQDExlzcHJpbmctc2FtcGxlcy10cnVzdGVkLWNhgghC
-rW20bQfpBzAdBgNVHQ4EFgQUbTwdOttQ8rYcCuW95y5ZEdW0CsEwDQYJKoZIhvcN
-AQELBQADggEBAKW0Z0oq+jGvjfrKhxqxW3mfEZT+rrjkZXXC0f4YtH5HhddM/Jk/
-kB3p3OWoUS1b9F/jkFVZjihL7iKhpy8XvukRI6cm5PNbY9PN0hzmf0dg+3W61R1Q
-DB0rAJMGmhMw7j6mpZVcZS15gxP3pR/4JCM2xjDrpgGmwAJDPLD2b2tTX5Zr66mF
-fZ0pl414990wBwDDPi+vlJ345fcwATvLeYxLykXCpCiLDziW81PZ/NnMXhfL75QB
-Z9Pfg9Ose2esdJ+FOYPhZr85BQxS46DBtAsUZHjQXBO7/xbahv3euKV0jlJkzkre
-fqMfdOOCBi7vUpqCW7c0n2cIEwJiqO0HGU4=
+ZyBTYW1wbGVzMSIwIAYDVQQDExlzcHJpbmctc2FtcGxlcy10cnVzdGVkLWNhgggW
++B7jiasXDjAdBgNVHQ4EFgQURtuK0wyHKoPxDkTsNScqk1jZKWgwDQYJKoZIhvcN
+AQELBQADggEBAKKR/+yfDTnD7aHq47dhBzOZvuMyQwVrl73+9THLQSiv7o6VoDcW
+ZUxbZd4uXdKmZnoKNlrJe23yMc67f9EVCe6PwIwpefx5Ucgz5BvinAlqHiRWBT6j
+ffPLXhWzV4waNS+NhQ6JbADwRX5LQZtxJnac57u966kYc0D5U5Fcwsq+miXVkQaN
+tANdWu0msaDXTUy042bDj8avAxV+9cQhmlmtl7615P71xlCxF9LZZMBcBiM5B20N
+O8hhMenVnWQk8X5at91wxLR7NHdq2MIiSRWZ3MkIeede55tl8lW1/ROEvjQLukyQ
+OqLxwY9cc6aGdUaR4ptu6up/F7pVvBL1N+E=
 -----END CERTIFICATE-----
diff --git a/samples/x509-certificate-generator/generated/spring-samples-trusted-ca-keystore.p12 b/samples/x509-certificate-generator/generated/spring-samples-trusted-ca-keystore.p12
index a1f572d9..d3a3e30b 100644
Binary files a/samples/x509-certificate-generator/generated/spring-samples-trusted-ca-keystore.p12 and b/samples/x509-certificate-generator/generated/spring-samples-trusted-ca-keystore.p12 differ
diff --git a/samples/x509-certificate-generator/generated/spring-samples-trusted-ca.pem b/samples/x509-certificate-generator/generated/spring-samples-trusted-ca.pem
index 4a8e14b2..b0e65df4 100644
--- a/samples/x509-certificate-generator/generated/spring-samples-trusted-ca.pem
+++ b/samples/x509-certificate-generator/generated/spring-samples-trusted-ca.pem
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDajCCAlKgAwIBAgIIQq1ttG0H6QcwDQYJKoZIhvcNAQELBQAwWzELMAkGA1UE
+MIIDajCCAlKgAwIBAgIIFvge44mrFw4wDQYJKoZIhvcNAQELBQAwWzELMAkGA1UE
 BhMCVVMxDzANBgNVBAoTBlNwcmluZzEXMBUGA1UECxMOU3ByaW5nIFNhbXBsZXMx
-IjAgBgNVBAMTGXNwcmluZy1zYW1wbGVzLXRydXN0ZWQtY2EwHhcNMjQwNDAyMTAy
-MDE2WhcNMjUwNDAyMTAyMDE2WjBbMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGU3By
+IjAgBgNVBAMTGXNwcmluZy1zYW1wbGVzLXRydXN0ZWQtY2EwHhcNMjUwNzA3MjMw
+MjU4WhcNMjYwNzA3MjMwMjU4WjBbMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGU3By
 aW5nMRcwFQYDVQQLEw5TcHJpbmcgU2FtcGxlczEiMCAGA1UEAxMZc3ByaW5nLXNh
 bXBsZXMtdHJ1c3RlZC1jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALvN0oPFMEo87oy2o0u7auqIFIt3czyH+8SCJL3jUCbCNnA9THh41Bpo3tVARVTh
-DF2wdzL1nZdYCL5Z4eYujlDe4TyzPTioW+eMBkIt6NuDdWbAyEsDizzI6z/2217z
-6xp3BowgQdUZlVd6t9LuHU7LD9IAOkXJFPbeY5/dda1txC2sOAUKF3C9g7H+QZE+
-bURY6rsAYVSeyLYnwkR0J1BgHidx6hy2T1vLncrdnL/MZp2lYrk+0MB42sHef/io
-0mLGj4GSzCZebh8mQTMwRI8dRVtx/qJTQHWJS3GfPPx+ewyp97sm18aJBPv9jqHk
-0OYQEjb8uXbbB5uf0kfIEj0CAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQUmJZhDGV3S/o2ifi1PP+NK/oEnO4wDQYJKoZIhvcNAQELBQADggEBAJ/+
-0pxDNgZx6YlcLWx0mHWIU0T76zXSkNFvNLBy6EYgpXmZMBiQl/PmY0p4UJ6bxunt
-rLHJe5lQwO1vKrFssZIoZrdK2BVlANJq4rh1Pp03o7kbs2IsYiIi0AhWWFKJep+/
-Iz3OJPBHDYlcazHi0bGpkxr+3eDjVx+i7F0bQjZjWBqHg7so+mx4MAA/s2BXfauT
-TuUWJYJH0PQHT0pmv06smI+xN/3hJJH9vioBGkw45bUxpLvGLx8IVbEl2xr4bH4f
-phRGI5dMjNVp+m4YpKl5UzFLAwnfUQNIJ2M3PupvlIQ4wqurCqEFU9Fp/fTI/83Q
-TjnuNVlObMkz9ccwL6Q=
+AK51gIij86TPPTVDCQ+lRYGrRx4XMrD8j1Yc9QPTid+v7HkPt44gr/33tHnx65US
+lmRDDTmpacvh/RhQ1JxlfCtsjfIIaQ1eNZUwjB4A6NcaJod8iUzI6Sk8O2mFJhgq
+furAI0mwXPvDIcrj6dEQ/Ssu/4R7+ANjnyLOocYXxhIfvdcxcMmz/VyqnpHXORqw
+X42XNJt1fDU6vcYIzmUqZ2qWcZFjuUUE+7bx6aAnfXklc0WbjgQZn4RAL0EZPtHD
+a37B3I4SGX0krjQfRL+eAXhG1lHjxPa5Wpt8oHWD87gj1sRMQl5snobrhRsd5cXD
+BvSqBVA6GCX/Rkv/KHLUIjkCAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQU/TM8OsIIwtElmHTMFYnTdfbfxmowDQYJKoZIhvcNAQELBQADggEBAEfW
+Kbx6aTlAqX459etsUk9hb6JTZTmjvLJtB+UkmjbKj9IuOGz5TvgXZW/fTcbGRSX2
+7CvNQuaJuJypbqZ9FGc58pGvz+KYe50ZBVsapdpx6rYVqCzSx+wnsn3G7a8D9WCB
+C1owfz2cLo9sU38kn+CacJv4hPvKgTUH2sgb++EhZu8tuA/miE/5JvSGAb9nz8yy
+2x+Sfn+TbQncYxBMqlvk8ooGPxbpSKWfolSpGX+PhcqmeVorAEfs8QNdLjBlKzy2
++6AEwKeM17LwmJ+iD6AwtHpSFQ+vHc+BZXlDvCAgfYD10AwB6I+kx1i2ZM7CPXm7
+X4YcCBG6BaG6CxYyyIA=
 -----END CERTIFICATE-----