diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 3784985f..f9d2811e 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -323,6 +323,29 @@ class eidas_sp($version="1.0.0",$hostname='localhost',$environment='qa') {
    ensure_resource('class','https_server',{})
 }
 
+class test_my_eid($version="1.0.1",$hostname='localhost',$environment='qa') {
+   $_version = safe_hiera('test_my_eid_version',$version)
+   $_hostname = safe_hiera('test_my_eid_hostname',$hostname)
+   file {['/etc/test-my-eid','/var/log/test-my-eid','/etc/ssl']: ensure => directory } ->
+   sunet::docker_run {'test-my-eid':
+      image    => 'docker.sunet.se/test-my-eid',
+      imagetag => $_version,
+      hostname => "${::fqdn}",
+      ports    => ['443:8443','127.0.0.01:444:8444'],
+      volumes  => ['/var/log/test-my-eid:/var/log/test-my-eid',
+                   '/etc/test-my-eid:/etc/test-my-eid',
+                   '/dev/log:/dev/log',
+                   '/etc/ssl:/etc/ssl'],
+      env      => ["SERVER_SERVLET_CONTEXT_PATH=/",
+                   "SP_ENTITY_ID=https://$_hostname/sp",
+                   "SPRING_PROFILES_ACTIVE=$environment",
+                   "SP_BASE_URI=https://$_hostname",
+                   "SP_DISCOVERY_STATIC_IDP_CONFIGURATION=file:/etc/test-my-eid/idp-disco-$environment.properties"]
+   }
+   ensure_resource('class','webserver',{})
+   ensure_resource('class','https_server',{})
+}
+
 class swedenconnect_refidp($version="1.0.3",$hostname='localhost') {
   $_version = safe_hiera('swedenconnect_refidp_version',$version)
   $_hostname = safe_hiera('swedenconnect_refidp_hostname',$hostname)
diff --git a/test-1.qa.sveidas.se/overlay/etc/test-my-eid/idp-disco-qa.properties b/test-1.qa.sveidas.se/overlay/etc/test-my-eid/idp-disco-qa.properties
new file mode 100644
index 00000000..ff120d75
--- /dev/null
+++ b/test-1.qa.sveidas.se/overlay/etc/test-my-eid/idp-disco-qa.properties
@@ -0,0 +1,16 @@
+include-unlisted=false
+
+idp.eidas.entity-id=https://qa.connector.eidas.swedenconnect.se/eidas
+idp.eidas.sort-order=0
+
+idp.freja.entity-id=https://idp-sweden-connect-valfr-2017-ct.test.frejaeid.com
+idp.freja.sort-order=1
+idp.freja.logo-url=https://idp-sweden-connect-valfr-2017-ct.test.frejaeid.com/idp/images/frejaeid_logo.svg
+idp.freja.logo-width=75
+idp.freja.logo-height=75
+
+idp.refidp.entity-id=https://qa.md.swedenconnect.se/
+idp.refidp.sort-order=2
+
+
+