diff --git a/src/main/resources/store/server-openssl.cnf b/src/main/resources/store/server-openssl.cnf
index 7b1a0f2c6b8c0fe32e9dc03e2aac2c1d3f73b599..4ea04508876213378a387647ef2cd8f3d8884ea3 100644
--- a/src/main/resources/store/server-openssl.cnf
+++ b/src/main/resources/store/server-openssl.cnf
@@ -22,4 +22,5 @@ subjectKeyIdentifier = hash
 [alt_names]
 DNS.1 = localhost
 IP.1  = 127.0.0.1
-DNS.2 = docker
\ No newline at end of file
+DNS.2 = docker
+DNS.3 = xta-test-server
diff --git a/src/main/resources/store/xta-test-client-jane-doe_keystore.p12 b/src/main/resources/store/xta-test-client-jane-doe_keystore.p12
index 0c0a1b20ac2922debfbbb7d973ddcdf6ecf068fc..329227de0780f077ce67a685e6dbc08bbc210d3d 100644
Binary files a/src/main/resources/store/xta-test-client-jane-doe_keystore.p12 and b/src/main/resources/store/xta-test-client-jane-doe_keystore.p12 differ
diff --git a/src/main/resources/store/xta-test-client-john-smith_keystore.p12 b/src/main/resources/store/xta-test-client-john-smith_keystore.p12
index dab946317cc45fd93bf87b573e959fa86c0c1afa..e7ee05ad7c99139ba3f6ec9aa611c7dd1a179660 100644
Binary files a/src/main/resources/store/xta-test-client-john-smith_keystore.p12 and b/src/main/resources/store/xta-test-client-john-smith_keystore.p12 differ
diff --git a/src/main/resources/store/xta-test-server_keystore.p12 b/src/main/resources/store/xta-test-server_keystore.p12
index b8937afa04dd5fa9322ac86830f990bbe4ec6f48..4b01606dc5b1dd7424a6f100f63914ea3e506d70 100644
Binary files a/src/main/resources/store/xta-test-server_keystore.p12 and b/src/main/resources/store/xta-test-server_keystore.p12 differ
diff --git a/src/main/resources/store/xta-test_truststore.jks b/src/main/resources/store/xta-test_truststore.jks
index d3d62904abc6726da06f54b5cd083406e15d5444..ade0f78ed620fd70b0a9892f3e7997b65ef802a3 100644
Binary files a/src/main/resources/store/xta-test_truststore.jks and b/src/main/resources/store/xta-test_truststore.jks differ