diff --git a/global/overlay/etc/puppet/modules/eid/manifests/test_my_eid.pp b/global/overlay/etc/puppet/modules/eid/manifests/test_my_eid.pp
index 6fd97e46..b02fa217 100644
--- a/global/overlay/etc/puppet/modules/eid/manifests/test_my_eid.pp
+++ b/global/overlay/etc/puppet/modules/eid/manifests/test_my_eid.pp
@@ -27,4 +27,14 @@ class eid::test_my_eid (
 
   file {["${service_dir}",'/var/log/test-my-eid','/etc/ssl']: ensure => directory }
 
+  # Create the environment specific config files from template
+  file { "${service_dir}/application-${environment}.yml":
+    ensure  => 'file',
+    content => template("eid/test_my_eid/application-${environment}.yml.erb")
+  }
+  file { "${service_dir}/idp-disco-${environment}.yml":
+    ensure  => 'file',
+    content => template("eid/test_my_eid/idp-disco-${environment}.yml.erb")
+  }
+
 }
diff --git a/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-test.yml b/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-test.yml
new file mode 100644
index 00000000..5cf32c40
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/application-test.yml
@@ -0,0 +1,68 @@
+---
+credential:
+  bundles:
+    keystore:
+      sp-keys-store:
+        location: file:${SP_CONFIG_DIRECTORY}/credentials/sp-keys.jks
+        type: JKS
+        password: secret
+    jks:
+      sp-sign:
+        name: sp-sign-key
+        store-reference: sp-keys-store
+        key:
+          alias: sign
+          key-password: secret
+      sp-decrypt:
+        name: sp-decrypt-key
+        store-reference: sp-keys-store
+        key:
+          alias: encrypt
+          key-password: secret
+      sp-md-sign:
+        name: sp-metadata-sign
+        store:
+          location: file:${SP_CONFIG_DIRECTORY}/credentials/metadata-sign.jks
+          type: JKS
+          password: secret
+        key:
+          alias: mdsign
+          key-password: secret
+
+server:
+  servlet:
+    context-path: /
+    session:
+      cookie:
+        domain: test.test.swedenconnect.se
+
+
+sp:
+  base-uri: https://test.test.swedenconnect.se
+  entity-id: https://test.test.swedenconnect.se/testmyeid
+  sign-entity-id: http://test.swedenconnect.se/testmyeid-sign
+  credential:
+    sign:
+      bundle: sp-sign
+    decrypt:
+      bundle: sp-decrypt
+    md-sign:
+      bundle: sp-md-sign
+  eidas-connector:
+    entity-id: https://test.connector.eidas.swedenconnect.se/eidas
+  discovery:
+    ignore-contracts: true
+    include-only-static: true
+    static-idp-configuration: file:${SP_CONFIG_DIRECTORY}/idp-disco-test.yml
+  federation:
+    metadata:
+      url: https://test.md.swedenconnect.se/role/idp.xml
+      validation-certificate: file:${SP_CONFIG_DIRECTORY}/sc-test-metadata.crt
+  security:
+    algorithm-config:
+      use-aes-gcm: true
+
+logging:
+  level:
+    root: WARN
+    testmyeid: INFO
diff --git a/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/idp-disco-test.yml b/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/idp-disco-test.yml
new file mode 100644
index 00000000..bfc16482
--- /dev/null
+++ b/global/overlay/etc/puppet/modules/eid/templates/test_my_eid/idp-disco-test.yml
@@ -0,0 +1,8 @@
+---
+idp:
+  - entity-id: https://test.connector.eidas.swedenconnect.se/eidas
+  - entity-id: https://idp-sweden-connect-valfr-2017-ct.test.frejaeid.com
+    logo-url: https://idp-sweden-connect-valfr-2017-ct.test.frejaeid.com/idp/images/frejaeid_logo.svg
+    logo-height: 75
+    logo-width: 75
+  - entity-id: http://test.test.swedenconnect.se/idp