diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index c55f80e9..613a3187 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -602,6 +602,8 @@ md-eu1.qa.komreg.net:
    saml_metadata:
       filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml
       url: https://qa.connector.eidas.swedenconnect.se/idp/metadata/sp
+   webserver:
+      enabled: true
    sunet::frontend::register_sites:
      sites:
        'qa.demw.eidas.swedenconnect.se':
@@ -615,12 +617,13 @@ md-eu1.qa.komreg.net:
    konsulter:
    autoupdate:
    eidas_de_middleware_hsm:
-      enabled: true
       version: 110-fixes-sc-p11
       hostname: demw.eidas.swedenconnect.se
    saml_metadata:
       filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml
       url: https://connector.eidas.swedenconnect.se/idp/metadata/sp
+   webserver:
+      enabled: true
    sunet::frontend::register_sites:
      sites:
        'demw.eidas.swedenconnect.se':
@@ -634,12 +637,13 @@ md-eu1.qa.komreg.net:
    konsulter:
    autoupdate:
    eidas_de_middleware_hsm:
-      enabled: false
       version: 110-fixes-sc-p11
       hostname: demw.eidas.swedenconnect.se
    saml_metadata:
       filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml
       url: https://connector.eidas.swedenconnect.se/idp/metadata/sp
+   webserver:
+      enabled: false
    sunet::frontend::register_sites:
      sites:
        'demw.eidas.swedenconnect.se':
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 20fa75b5..c28db13c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -304,7 +304,7 @@ class md_repo_server($hostname) {
    ensure_resource('class','https_server',{})
 }
 
-class eidas_de_middleware_hsm($version="110-fixes-sc-p11",$hostname='localhost',$enabled=false) {
+class eidas_de_middleware_hsm($version="110-fixes-sc-p11",$hostname='localhost') {
    $_version = safe_hiera('eidas_demw_version',$version)
    $_hostname = safe_hiera('eidas_demw_hostname',$hostname)
    $poseidas_admin_hashed_password = safe_hiera('poseidas_admin_hashed_password')
@@ -340,8 +340,6 @@ class eidas_de_middleware_hsm($version="110-fixes-sc-p11",$hostname='localhost',
                    "SPRING_DATASOURCE_PASSWORD=$spring_datasource_password"],
       extra_parameters => ["--log-driver=syslog"]
    }
-   ensure_resource('class','webserver',{enabled => $enabled})
-   ensure_resource('class','https_server',{})
 }
 
 class eidas_de_middleware($version="106-rs",$hostname='localhost') {
@@ -386,8 +384,6 @@ class eidas_de_middleware($version="106-rs",$hostname='localhost') {
                    "MIDDLEWARE_SIGN_PIN=$middleware_sign_pin"],
       extra_parameters => ["--log-driver=syslog"]
    }
-   ensure_resource('class','webserver',{})
-   ensure_resource('class','https_server',{})
 }
 
 class eidas_sp($version="1.0.0",$hostname='localhost',$environment='qa') {