diff --git a/phase4-peppol-client/src/test/resources/application.properties b/phase4-peppol-client/src/test/resources/application.properties
index 513b4bc3e..97d2ba74a 100644
--- a/phase4-peppol-client/src/test/resources/application.properties
+++ b/phase4-peppol-client/src/test/resources/application.properties
@@ -19,16 +19,15 @@ global.debug=true
 global.production=false
 global.nostartupinfo=true
 
-org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
 org.apache.wss4j.crypto.merlin.keystore.type=pkcs12
 org.apache.wss4j.crypto.merlin.keystore.file=test-ap-2023.p12
 org.apache.wss4j.crypto.merlin.keystore.password=peppol
 org.apache.wss4j.crypto.merlin.keystore.alias=cert
 org.apache.wss4j.crypto.merlin.keystore.private.password=peppol
 
-org.apache.wss4j.crypto.merlin.load.cacerts=false
-#org.apache.wss4j.crypto.merlin.truststore.provider=
 org.apache.wss4j.crypto.merlin.truststore.type=jks
+# For Test only use:       truststore/2018/pilot-truststore.jks
+# For Production only use: truststore/2018/prod-truststore.jks
 org.apache.wss4j.crypto.merlin.truststore.file=truststore/complete-truststore.jks
 org.apache.wss4j.crypto.merlin.truststore.password=peppol
 
diff --git a/phase4-peppol-server-webapp/src/main/resources/application.properties b/phase4-peppol-server-webapp/src/main/resources/application.properties
index cedbf3af0..2097e8b88 100644
--- a/phase4-peppol-server-webapp/src/main/resources/application.properties
+++ b/phase4-peppol-server-webapp/src/main/resources/application.properties
@@ -25,20 +25,21 @@ phase4.endpoint.address=http://localhost:8080/as4
 # Enable this, to enable the receiver checks
 #smp.url=http://smp.helger.com
 
-org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
 org.apache.wss4j.crypto.merlin.keystore.type=PKCS12
 org.apache.wss4j.crypto.merlin.keystore.file=keys/test-ap-2023.p12
 org.apache.wss4j.crypto.merlin.keystore.password=peppol
 org.apache.wss4j.crypto.merlin.keystore.alias=cert
 org.apache.wss4j.crypto.merlin.keystore.private.password=peppol
 
-#org.apache.wss4j.crypto.merlin.load.cacerts=false
-#org.apache.wss4j.crypto.merlin.truststore.provider=
 org.apache.wss4j.crypto.merlin.truststore.type=JKS
+# For Test only use:       truststore/2018/pilot-truststore.jks
+# For Production only use: truststore/2018/prod-truststore.jks
 org.apache.wss4j.crypto.merlin.truststore.file=truststore/complete-truststore.jks
 org.apache.wss4j.crypto.merlin.truststore.password=peppol
 
 # SMP Client
 smpclient.truststore.type=JKS
+# For Test only use:       truststore/2018/smp-pilot-truststore.jks
+# For Production only use: truststore/2018/smp-prod-truststore.jks
 smpclient.truststore.path=truststore/complete-truststore.jks
 smpclient.truststore.password=peppol
diff --git a/phase4-server-webapp/src/main/resources/application.properties b/phase4-server-webapp/src/main/resources/application.properties
index 4a17799e8..613e8f3f2 100644
--- a/phase4-server-webapp/src/main/resources/application.properties
+++ b/phase4-server-webapp/src/main/resources/application.properties
@@ -27,15 +27,12 @@ server.proxy.enabled=false
 
 phase4.endpoint.address=http://localhost-dummy/as4
 
-org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
 org.apache.wss4j.crypto.merlin.keystore.file=keys/dummy-pw-test.jks
 org.apache.wss4j.crypto.merlin.keystore.password=test
 org.apache.wss4j.crypto.merlin.keystore.type=jks
 org.apache.wss4j.crypto.merlin.keystore.alias=ph-as4
 org.apache.wss4j.crypto.merlin.keystore.private.password=test
 
-#org.apache.wss4j.crypto.merlin.load.cacerts=false
 #org.apache.wss4j.crypto.merlin.truststore.file=
 #org.apache.wss4j.crypto.merlin.truststore.password=
 #org.apache.wss4j.crypto.merlin.truststore.type=
-#org.apache.wss4j.crypto.merlin.truststore.provider=