diff --git a/examples/features/broker-connection/amqp-sending-overssl/pom.xml b/examples/features/broker-connection/amqp-sending-overssl/pom.xml
index d2227ae9e2..a4e7a4165a 100644
--- a/examples/features/broker-connection/amqp-sending-overssl/pom.xml
+++ b/examples/features/broker-connection/amqp-sending-overssl/pom.xml
@@ -85,7 +85,7 @@ under the License.
                      <ignore>${noServer}</ignore>
                      <spawn>true</spawn>
                      <location>${basedir}/target/server1</location>
-                     <testURI>tcp://localhost:5771?sslEnabled=true;trustStorePath=target/server1/etc/activemq.example.truststore;trustStorePassword=activemqexample</testURI>
+                     <testURI>tcp://localhost:5771?sslEnabled=true;trustStorePath=target/server1/etc/server-ca-truststore.jks&amp;trustStorePassword=securepass</testURI>
                      <args>
                         <param>run</param>
                      </args>
@@ -101,7 +101,7 @@ under the License.
                      <spawn>true</spawn>
                      <ignore>${noServer}</ignore>
                      <location>${basedir}/target/server0</location>
-                     <testURI>tcp://localhost:5671?sslEnabled=true;trustStorePath=target/server0/etc/activemq.example.truststore;trustStorePassword=activemqexample</testURI>
+                     <testURI>tcp://localhost:5671?sslEnabled=true;trustStorePath=target/server0/etc/server-ca-truststore.jks&amp;trustStorePassword=securepass</testURI>
                      <args>
                         <param>run</param>
                      </args>
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/java/org/apache/activemq/artemis/jms/example/BrokerConnectionSenderSSL.java b/examples/features/broker-connection/amqp-sending-overssl/src/main/java/org/apache/activemq/artemis/jms/example/BrokerConnectionSenderSSL.java
index 841b075bc5..ddb63fbb07 100644
--- a/examples/features/broker-connection/amqp-sending-overssl/src/main/java/org/apache/activemq/artemis/jms/example/BrokerConnectionSenderSSL.java
+++ b/examples/features/broker-connection/amqp-sending-overssl/src/main/java/org/apache/activemq/artemis/jms/example/BrokerConnectionSenderSSL.java
@@ -35,7 +35,7 @@ public class BrokerConnectionSenderSSL {
 
    public static void main(final String[] args) throws Exception {
       Connection connectionOnServer0 = null;
-      ConnectionFactory connectionFactoryServer0 = new JmsConnectionFactory("amqps://localhost:5671?transport.trustStoreLocation=target/server0/etc/activemq.example.truststore&transport.trustStorePassword=activemqexample");
+      ConnectionFactory connectionFactoryServer0 = new JmsConnectionFactory("amqps://localhost:5671?transport.trustStoreLocation=target/server0/etc/server-ca-truststore.jks&transport.trustStorePassword=securepass");
 
       // Step 1. Create a connection on server0, and send a few messages
       try {
@@ -58,7 +58,7 @@ public class BrokerConnectionSenderSSL {
       // Step 2. create a connection on server1, and receive a few messages.
       //          the sender on the broker conneciton will take care of the transfer.
       Connection connectionOnServer1 = null;
-      ConnectionFactory connectionFactoryServer1 = new JmsConnectionFactory("amqps://localhost:5771?transport.trustStoreLocation=target/server1/etc/activemq.example.truststore&transport.trustStorePassword=activemqexample");
+      ConnectionFactory connectionFactoryServer1 = new JmsConnectionFactory("amqps://localhost:5771?transport.trustStoreLocation=target/server0/etc/server-ca-truststore.jks&transport.trustStorePassword=securepass");
 
       try {
          connectionOnServer1 = connectionFactoryServer1.createConnection();
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/activemq.example.keystore b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/activemq.example.keystore
deleted file mode 100644
index 291a34af75..0000000000
Binary files a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/activemq.example.keystore and /dev/null differ
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/activemq.example.truststore b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/activemq.example.truststore
deleted file mode 100644
index 07d359cc31..0000000000
Binary files a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/activemq.example.truststore and /dev/null differ
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/broker.xml b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/broker.xml
index 0274cb33c7..f5ac900208 100644
--- a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/broker.xml
@@ -32,11 +32,11 @@ under the License.
       <acceptors>
          <!-- keystores will be found automatically if they are on the classpath -->
          <!-- The CORE protocol only used for artemis-maven-plugin verifying the server is up for example to start -->
-         <acceptor name="netty-ssl-acceptor">tcp://localhost:5671?sslEnabled=true;keyStorePath=activemq.example.keystore;keyStorePassword=activemqexample;protocols=AMQP,CORE</acceptor>
+         <acceptor name="netty-ssl-acceptor">tcp://localhost:5671?sslEnabled=true;keyStorePath=server-keystore.jks;keyStorePassword=securepass;protocols=AMQP,CORE</acceptor>
       </acceptors>
 
       <broker-connections>
-         <amqp-connection uri="tcp://localhost:5771?sslEnabled=true;verifyHost=true;trustStorePath=activemq.example.truststore;trustStorePassword=activemqexample" name="otherBrokerSSL" retry-interval="1000">
+         <amqp-connection uri="tcp://localhost:5771?sslEnabled=true;verifyHost=true;trustStorePath=server-ca-truststore.jks;trustStorePassword=securepass" name="otherBrokerSSL" retry-interval="1000">
             <sender address-match="#"/>
          </amqp-connection>
       </broker-connections>
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/server-ca-truststore.jks b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/server-ca-truststore.jks
new file mode 100644
index 0000000000..3fe0f29ad2
Binary files /dev/null and b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/server-ca-truststore.jks differ
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/server-keystore.jks b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/server-keystore.jks
new file mode 100644
index 0000000000..5a7e2c00bf
Binary files /dev/null and b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server0/server-keystore.jks differ
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/activemq.example.keystore b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/activemq.example.keystore
deleted file mode 100644
index 291a34af75..0000000000
Binary files a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/activemq.example.keystore and /dev/null differ
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/activemq.example.truststore b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/activemq.example.truststore
deleted file mode 100644
index 07d359cc31..0000000000
Binary files a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/activemq.example.truststore and /dev/null differ
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/broker.xml b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/broker.xml
index 8f9fe5f6a5..77f3d0432d 100644
--- a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/broker.xml
+++ b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/broker.xml
@@ -32,7 +32,7 @@ under the License.
       <acceptors>
          <!-- keystores will be found automatically if they are on the classpath -->
          <!-- The CORE protocol only used for artemis-maven-plugin verifying the server is up for example to start -->
-         <acceptor name="netty-ssl-acceptor">tcp://localhost:5771?sslEnabled=true;keyStorePath=activemq.example.keystore;keyStorePassword=activemqexample;protocols=AMQP,CORE</acceptor>
+         <acceptor name="netty-ssl-acceptor">tcp://localhost:5771?sslEnabled=true;keyStorePath=server-keystore.jks;keyStorePassword=securepass;protocols=AMQP,CORE</acceptor>
       </acceptors>
 
       <!-- Other config -->
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/server-ca-truststore.jks b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/server-ca-truststore.jks
new file mode 100644
index 0000000000..3fe0f29ad2
Binary files /dev/null and b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/server-ca-truststore.jks differ
diff --git a/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/server-keystore.jks b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/server-keystore.jks
new file mode 100644
index 0000000000..5a7e2c00bf
Binary files /dev/null and b/examples/features/broker-connection/amqp-sending-overssl/src/main/resources/activemq/server1/server-keystore.jks differ