diff --git a/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
index c8084c25..88d5521d 100644
--- a/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
+++ b/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
@@ -16,8 +16,8 @@ spring:
             private-key: file:${CONNECTOR_DIRECTORY}/credentials/tomcat/tomcat-key.pem
         sunet-tls-trust:
           keystore:
-            certificate: file:/etc/ssl/certs/connector-test-sto3-1.komreg.net_infra.crt
-            private-key: file:/etc/ssl/private/connector-test-sto3-1.komreg.net_infra.key
+            certificate: file:/etc/ssl/certs/<%= @server_fqdn %>_infra.crt
+            private-key: file:/etc/ssl/private/<%= @server_fqdn %>_infra.key
           truststore:
             certificate: file:/etc/ssl/certs/infra.crt
   data: