diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index ee9da011..78c29acd 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1056,15 +1056,22 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
-    eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
-    md_repo_client: null
-    md_signer: {dest_host: natpub-2.komreg.net, name: natmd-prod, version: 1.1.5-eidas}
     metadatamgrs: null
     nrpe: null
+    sunet::metadata::mdqp: {imagetag: v2023-11-01-01, mdq_service: 'http://pyff_pyff_1:8080'}
+    sunet::metadata::metadata_repo: {hostname: r1.komreg.net, repo: komreg-metadata.git,
+      signed_repo: true}
+    sunet::metadata::pyff_compose:
+      hsm_client: true
+      luna_imagetag: 7.4-dev
+      pyff_extra_volumes: ['/etc/credentials:/etc/credentials']
+      pyff_imagetag: swamid-2023-10-24
+      pyff_pipeline: natmd-prod-ng.fd
+      pyff_update_frequency: 1800
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -1520,7 +1527,7 @@ members:
   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, eumd-test-1.komreg.net,
-    eumd-test-2.komreg.net, natmd-2.komreg.net]
+    eumd-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,
@@ -1609,10 +1616,10 @@ members:
   md_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
     eupub-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, p2.qa.komreg.net]
   md_repo_client: [eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net,
-    md-eu1.qa.komreg.net, natmd-2.komreg.net]
+    md-eu1.qa.komreg.net]
   md_repo_server: [r1.komreg.net]
   md_signer: [eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net,
-    md-eu1.qa.komreg.net, natmd-2.komreg.net]
+    md-eu1.qa.komreg.net]
   mdsl_publisher: [eupub-1.komreg.net, eupub-2.komreg.net, eupub-test-1.komreg.net,
     eupub-test-2.komreg.net, p2.qa.komreg.net]
   metadatamgrs: [eumd-1.komreg.net, eumd-2.komreg.net, eumd-test-1.komreg.net, eumd-test-2.komreg.net,
@@ -1665,12 +1672,12 @@ members:
   sunet::fticks: [log.qa.sveidas.se]
   sunet::metadata::mdq_publisher: [natpub-test-1.komreg.net, natpub-test-2.komreg.net,
     p1.komreg.net]
-  sunet::metadata::mdqp: [md1.komreg.net, natmd-1.komreg.net, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net]
-  sunet::metadata::metadata_repo: [md1.komreg.net, natmd-1.komreg.net, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net]
-  sunet::metadata::pyff_compose: [md1.komreg.net, natmd-1.komreg.net, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net]
+  sunet::metadata::mdqp: [md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
+    natmd-test-1.komreg.net, natmd-test-2.komreg.net]
+  sunet::metadata::metadata_repo: [md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
+    natmd-test-1.komreg.net, natmd-test-2.komreg.net]
+  sunet::metadata::pyff_compose: [md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
+    natmd-test-1.komreg.net, natmd-test-2.komreg.net]
   sunet::rsyslog: [country-test-1.test.komreg.net, demw-1.qa.sveidas.se, demw-1.sveidas.se,
     demw-2.sveidas.se, eidas-connector-1.sveidas.se, eidas-connector-1.test.sveidas.se,
     eidas-connector-2.sveidas.se, eidas-connector-2.test.sveidas.se, eidas-connector-3.sveidas.se,