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 6f5ad238..16e683f9 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
@@ -8,8 +8,8 @@ spring:
       pem:
         connector-web-server:
           keystore:
-            certificate: file:${CONNECTOR_DIRECTORY}/credentials/tomcat/tomcat-cert.pem
-            private-key: file:${CONNECTOR_DIRECTORY}/credentials/tomcat/tomcat-key.pem
+            certificate: file:/etc/ssl/certs/<%= @server_fqdn %>_infra.crt
+            private-key: file:/etc/ssl/private/<%= @server_fqdn %>_infra.key
         sunet-tls-trust:
           truststore:
             certificate: file:/etc/ssl/certs/infra.crt