diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 78925225..1a727470 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -465,6 +465,7 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -479,6 +480,7 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: {version: '5:20.10.6~3-0~ubuntu-focal'}
+    eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1620,8 +1622,9 @@ members:
     eidas-connector-4.sveidas.se, eidas-node-1.qa.sveidas.se]
   eidas_de_middleware: [demw-1.qa.sveidas.se]
   eidas_de_middleware_hsm: [demw-1.sveidas.se, demw-2.sveidas.se]
-  eidas_hsm_client: [eumd-1.komreg.net, eumd-2.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
-    natmd-test-1.komreg.net, natmd-test-2.komreg.net]
+  eidas_hsm_client: [eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net,
+    eumd-test-2.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net,
+    natmd-test-2.komreg.net]
   eidas_log: [log-1.sveidas.se, log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se]
   eidas_metadata_key: [md-eu1.qa.komreg.net, md1.komreg.net]
   eidas_proxy: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se,
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 38c277a8..b2b09987 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -526,6 +526,7 @@ eumd-test-1.komreg.net:
    metadatamgrs:
    konsulter:
    md_repo_client:
+   eidas_hsm_client:
 
 natpub-1.komreg.net:
    autoupdate:
@@ -621,6 +622,7 @@ eumd-test-2.komreg.net:
    metadatamgrs:
    konsulter:
    md_repo_client:
+   eidas_hsm_client:
 
 natpub-2.komreg.net:
    autoupdate: