diff --git a/samples/demo-authorizationserver/src/main/resources/keystore.p12 b/samples/demo-authorizationserver/src/main/resources/keystore.p12
index 30e11861..b6fb584a 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
new file mode 100644
index 00000000..6425b67a
Binary files /dev/null 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 d8ee2f05..2a644abb 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 ec8dc5b7..15b70118 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 13328bd1..7b692c09 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 e35b44d4..decaff73 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-----
-MIIEBjCCAu6gAwIBAgII03hpNZ1ta6AwDQYJKoZIhvcNAQELBQAwWzELMAkGA1UE
+MIIEBjCCAu6gAwIBAgIIpMf6rDm8a1IwDQYJKoZIhvcNAQELBQAwWzELMAkGA1UE
 BhMCVVMxDzANBgNVBAoTBlNwcmluZzEXMBUGA1UECxMOU3ByaW5nIFNhbXBsZXMx
-IjAgBgNVBAMTGXNwcmluZy1zYW1wbGVzLXRydXN0ZWQtY2EwHhcNMjQwMzE0MTQw
-NDAzWhcNMjUwMzE0MTQwNDAzWjBTMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGU3By
+IjAgBgNVBAMTGXNwcmluZy1zYW1wbGVzLXRydXN0ZWQtY2EwHhcNMjQwNDAyMTAy
+MDE2WhcNMjUwNDAyMTAyMDE2WjBTMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGU3By
 aW5nMRcwFQYDVQQLEw5TcHJpbmcgU2FtcGxlczEaMBgGA1UEAxMRc3ByaW5nLXNh
-bXBsZXMtY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoPSEF0DTM
-q+CDZBQ9vvLN+7TtpPcVWEl2oL7oW3WqhYViqxLBS+LLcbX4DbhRNCbHfK7AS8Yy
-RXbbkUeBelgY59Z3s+aWY5Agz0Q5bg/HyUrZkH7BpjW4ADuIyDBSAZQ2848e5bxT
-hSIRmmke3mL1Q9DmJl+z/Ih+t2D3a48UgGKSoU8+3bZgKzF/SAlMaHtn9a5psbEu
-lMGFGdybiqFtvKev/H7aejQe7KRoK087rImNx06aQ5tvwzpC7x2tA/OaY3IJAkJp
-sKkZ36M2iXZN9sbCSGwDTBZLKJg63TOFCOT0JwL+2MWinprgfgoq9G3+qVeyWX05
-rWPbDXlzukFTAgMBAAGjgdUwgdIwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8B
-Af8EBAMCAQYwgYwGA1UdIwSBhDCBgYAUqvSVTt2P1ByL7pMWHHD+sc8wTaChX6Rd
+bXBsZXMtY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgOMG5PXY+
+jOUp07/wltx0bPN4JiFhCcK35fE6nzxBQJ/gtR6djAjrEOtJh5uJB8k7kF9bKMU3
+Eb3kBwO/vR6pemKVUMFA1wyMthnrR36D+Q2MwhWG6BGGTkQ9GSBv6JSWZtQeJBHT
+P6XFsbtMySFSamqdTnXjspv4hVAs/gNYyHoAfR67I0L1mSdlnHo2R48+eYA+7Kqt
+d4IuW/nJY4ZCYNksOEemhY2ck7VGmd87PgwibXLVmbUob7UOdn4j7x4rqUgaHl83
+eBnu6W+xYTM1Cjc/jITMf3dXejEr9/68CNIxlnB02cZnr1JE6Bw6yIFMcrNaCYOd
+ODt4zaViZBzRAgMBAAGjgdUwgdIwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8B
+Af8EBAMCAQYwgYwGA1UdIwSBhDCBgYAUmJZhDGV3S/o2ifi1PP+NK/oEnO6hX6Rd
 MFsxCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZTcHJpbmcxFzAVBgNVBAsTDlNwcmlu
-ZyBTYW1wbGVzMSIwIAYDVQQDExlzcHJpbmctc2FtcGxlcy10cnVzdGVkLWNhggj1
-HkqUdTpdPzAdBgNVHQ4EFgQUn8MbZ0Q55bjH/AXvk7aAKkvm25wwDQYJKoZIhvcN
-AQELBQADggEBAKZc0akBGdahQaapWt81Twa/Yj8uH1tMXg2WVrEt8WLV9fdClJFk
-aFvRzhgMwO9//lnT9H6iZFfDwsvax0h/KShO5hXNJ7f6Pnr9jWg5U3/RrU5MMZNu
-YGdZ0pBk4Sidt/9aP9CvuHkPZpzyNBPKT53t49E/Wxt9vgnt8THKXsR1Jf7SrX7T
-z6Yxl0BY9UVxJwnxzHr8pUZMSS5h7sdJqJ3HVfqd3JJZvtd++P8cVj+vsiGTh7dW
-nU71ISYvnWXbGCJbhT8PcKwYKDiFu17k734H9NoZWDqsYB9p8MXzP+z76rg7urag
-fZIfBlWdKYcRixCXvWLWmdUOhHE4cAsdZys=
+ZyBTYW1wbGVzMSIwIAYDVQQDExlzcHJpbmctc2FtcGxlcy10cnVzdGVkLWNhgghC
+rW20bQfpBzAdBgNVHQ4EFgQUbTwdOttQ8rYcCuW95y5ZEdW0CsEwDQYJKoZIhvcN
+AQELBQADggEBAKW0Z0oq+jGvjfrKhxqxW3mfEZT+rrjkZXXC0f4YtH5HhddM/Jk/
+kB3p3OWoUS1b9F/jkFVZjihL7iKhpy8XvukRI6cm5PNbY9PN0hzmf0dg+3W61R1Q
+DB0rAJMGmhMw7j6mpZVcZS15gxP3pR/4JCM2xjDrpgGmwAJDPLD2b2tTX5Zr66mF
+fZ0pl414990wBwDDPi+vlJ345fcwATvLeYxLykXCpCiLDziW81PZ/NnMXhfL75QB
+Z9Pfg9Ose2esdJ+FOYPhZr85BQxS46DBtAsUZHjQXBO7/xbahv3euKV0jlJkzkre
+fqMfdOOCBi7vUpqCW7c0n2cIEwJiqO0HGU4=
 -----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 2e5d88c6..a1f572d9 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 758adb52..4a8e14b2 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-----
-MIIDajCCAlKgAwIBAgII9R5KlHU6XT8wDQYJKoZIhvcNAQELBQAwWzELMAkGA1UE
+MIIDajCCAlKgAwIBAgIIQq1ttG0H6QcwDQYJKoZIhvcNAQELBQAwWzELMAkGA1UE
 BhMCVVMxDzANBgNVBAoTBlNwcmluZzEXMBUGA1UECxMOU3ByaW5nIFNhbXBsZXMx
-IjAgBgNVBAMTGXNwcmluZy1zYW1wbGVzLXRydXN0ZWQtY2EwHhcNMjQwMzE0MTQw
-NDAzWhcNMjUwMzE0MTQwNDAzWjBbMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGU3By
+IjAgBgNVBAMTGXNwcmluZy1zYW1wbGVzLXRydXN0ZWQtY2EwHhcNMjQwNDAyMTAy
+MDE2WhcNMjUwNDAyMTAyMDE2WjBbMQswCQYDVQQGEwJVUzEPMA0GA1UEChMGU3By
 aW5nMRcwFQYDVQQLEw5TcHJpbmcgU2FtcGxlczEiMCAGA1UEAxMZc3ByaW5nLXNh
 bXBsZXMtdHJ1c3RlZC1jYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANhir/CRtHXIVIWqooWPOXbLfEPFfZK85PHmpCm3NqgWpYoq/4T8dKYbtoYpG7sf
-TFtvL91+WT2rgkm3xOISW1FU9Za2cZ2WMt0VGzGwcKGQ9ISPJh+FZHJ3wlu2xblw
-eDGpxFLWV6jt9MPRdesI6Ypz/SSaV5gi5W7RTr8vklCXjGhiuc0A7cy+1GwEIr+2
-NDVj5zm7EDXYhvoutUd5ny8nG7vxvPx9Al7oIwdqMUuwG4mV3tscg77xEHGBDD5u
-1Y54DA75M+FfO9mnfkuDHbrlafOR1Sg3IwEVjQx2bS+uBl5e4goKJjPRlkmIIhuN
-9xCqXjs8uL+nfff9x/32mnMCAwEAAaMyMDAwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQUqvSVTt2P1ByL7pMWHHD+sc8wTaAwDQYJKoZIhvcNAQELBQADggEBAFZO
-/6y+Qddnb0y731J38E/e5/8iJhvrj4FgskMApSV/6GvL9o4uzCnOoQwgE4sfa6/8
-Cht6UWbDvRJCtvvRS1TZPY25nqtS/3RQREM2w7aBIqI+Srt+TVlw84wfpmq2yzci
-8rw7nEwwlJP0haGSijW/x8z1HOgzNjRwSp9wTanrcbJgz2REiRUdfmH2BJWslens
-edTgQIF3Bf71J+kgCxITLo18Nlb0bOEdcs3nY38LbxiA+NI8f8kGhrGA47G29hMF
-//4lpO5R/k94mM3IFdv4t9ejZojSUiFgkdhtNHKAERqElzeumSR4Iru+CfCN5s+U
-/wZdCNzUIOVvC9vlcpk=
+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=
 -----END CERTIFICATE-----