diff --git a/global/overlay/etc/puppet/modules/eid/manifests/connector.pp b/global/overlay/etc/puppet/modules/eid/manifests/connector.pp
index 8e70397c..d11d0317 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/connector.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/connector.pp
@@ -35,6 +35,11 @@ class eid::connector (
       base64    => true
     }
 
+    file { "${connector_directory}/application-${environment}.yml":
+      ensure  => 'file',
+      content => template("eid/connector/application-${environment}.yml.erb")
+    }
+
     sunet::docker_compose { 'eidas-connector':
       content          => template('eid/connector/docker-compose.yml.erb'),
       service_name     => 'eidas-connector',
diff --git a/eidas-test-connector/overlay/opt/eidas-connector/application-test.yml b/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
similarity index 87%
rename from eidas-test-connector/overlay/opt/eidas-connector/application-test.yml
rename to global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
index 82f64ab3..8497bb29 100644
--- a/eidas-test-connector/overlay/opt/eidas-connector/application-test.yml
+++ b/global/overlay/etc/puppet/modules/eid/templates/connector/application-test.yml.erb
@@ -3,6 +3,10 @@
 #
 ---
 spring:
+  session:
+    timeout: 15m
+    redis:
+      namespace: spring:session:connector
   ssl:
     bundle:
       pem:
@@ -11,8 +15,24 @@ spring:
             certificate: file:${CONNECTOR_DIRECTORY}/credentials/tomcat/tomcat-cert.pem
             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
           truststore:
             certificate: file:/etc/ssl/certs/infra.crt
+  data:
+    redis:
+      cluster:
+        nodes:
+          - 89.45.236.201:6379
+          - 89.45.237.40:6379
+          - 89.45.237.212:6379
+      password: '<%= scope.call_function('safe_hiera', ['redict_password']) %>'
+      ssl:
+        enabled: true
+        bundle: sunet-tls-trust
+      ssl-ext:
+        enable-hostname-verification: false
 
 server:
   port: 8443
@@ -29,7 +49,7 @@ management:
     port: 8444
   health:
     redis:
-      enabled: false
+      enabled: true
 
 credential:
   bundles:
@@ -120,9 +140,9 @@ saml:
     entity-id: https://test.connector.eidas.swedenconnect.se/eidas
     base-url: ${connector.base-url}
     session:
-      module: memory
+      module: redis
     replay:
-      type: memory
+      type: redis
       context: "connector-replay-cache"
     metadata-providers:
       - location: https://test.md.swedenconnect.se/role/sp.xml