diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 5ba91db0..22c87d91 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -459,6 +459,22 @@ md-eu1.qa.komreg.net:
       name: eidas-qa
       dest_host: p2.qa.komreg.net
 
+'^test-[0-9]+\.qa\.sveidas\.se$':
+   eid::dockerhost:
+   konsulter:
+   autoupdate:
+   eidas_sp:
+      version: 1.0.0
+      hostname: test.qa.swedenconnect.se
+
+'^test-[0-9]+\.sveidas\.se$':
+   eid::dockerhost:
+   konsulter:
+   autoupdate:
+   eidas_sp:
+      version: 1.0.0
+      hostname: test.swedenconnect.se
+
 '^eidas-connector-[0-9]+\.sveidas\.se$':
    eid::dockerhost:
    konsulter:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 85ec48e9..59518824 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -250,6 +250,28 @@ class md_repo_server($hostname) {
    class {'https_server': }
 }
 
+class eidas_sp($version="1.0.0",$hostname='localhost') {
+   $_version = safe_hiera('eidas_sp_version',$version)
+   $_hostname = safe_hiera('eidas_sp_hostname',$hostname)
+   file {['/etc/eidas-sp','/var/log/eidas-sp','/etc/ssl']: ensure => directory } ->
+   sunet::docker_run {'eidas-sp':
+      image    => 'docker.sunet.se/eidas-sp',
+      imagetag => $_version,
+      hostname => "${::fqdn}",
+      ports    => ['443:8443','127.0.0.01:444:8444'],
+      volumes  => ['/var/log/eidas-sp:/var/log/eidas-sp',
+                   '/etc/eidas-sp:/etc/eidas-sp',
+                   '/dev/log:/dev/log',
+                   '/etc/ssl:/etc/ssl'],
+      env      => ["SERVER_SERVLET_CONTEXT_PATH=/",
+                   "SP_USE_SC_LOGO=false",
+                   "SPRING_PROFILES_ACTIVE=qa",
+                   "SP_BASE_URI=https://$_hostname"]
+   } ->
+   class {'webserver': } ->
+   class {'https_server': }
+}
+
 class eidas_connector($version="1.0.6",$hostname='localhost') {
    $_version = safe_hiera('eidas_connector_version',$version)
    $_hostname = safe_hiera('eidas_connector_hostname',$hostname)