diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 14c0ba2d..b1d23d12 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1082,16 +1082,23 @@ classes:
   natmd-test-2.komreg.net:
     autoupdate: null
     common: null
-    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
-    eidas_hsm_client: null
+    eid::dockerhost: {docker_repo: stable, version: '5:23.0.6-1~ubuntu.20.04~focal'}
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
-    md_repo_client: null
-    md_signer: {dest_host: natpub-test-2.komreg.net, name: natmd-test, version: 1.1.5-eidas}
     metadatamgrs: null
     nrpe: null
+    sunet::metadata::mdqp: {imagetag: v2023-05-17-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-05-08
+      pyff_pipeline: natmd-test-ng.fd
+      pyff_update_frequency: 1800
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -1149,20 +1156,22 @@ classes:
   natpub-test-2.komreg.net:
     autoupdate: null
     common: null
+    eid::dockerhost: {version: '5:23.0.6-1~ubuntu.20.04~focal'}
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
-    md_publisher: {keyname: natpub-test-2.komreg.net_infra, signer_ip_adress: 89.45.237.80}
-    metadatamgrs: null
+    metadatamgrs_new: null
     nrpe: null
     sunet::frontend::register_sites:
       sites:
         test.md.swedenconnect.se:
           frontends: [fe-fre-1.test.komreg.net, fe-tug-1.test.komreg.net]
           port: '443'
+    sunet::metadata::mdq_publisher: {valid_until: 7, validate_cert: /var/www/html/md-signer.crt,
+      xml_dir: role}
     sunet::rsyslog: null
     sunet::server: *id002
-    sunetops: null
+    sunetops_new: null
   nic.komreg.net:
     autoupdate: null
     common: null
@@ -1479,10 +1488,10 @@ members:
     fe-fre-3.komreg.net, fe-tug-1.test.komreg.net, fe-tug-3.komreg.net, log-1.sveidas.se,
     log-1.test.sveidas.se, log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net,
     md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-test-1.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se,
-    prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, refidp-1.test.sveidas.se,
-    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
-    validator-test-1.komreg.net]
+    natmd-test-2.komreg.net, natpub-test-1.komreg.net, natpub-test-2.komreg.net, nic.komreg.net,
+    prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se,
+    refidp-1.test.sveidas.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
+    validator-2.komreg.net, validator-test-1.komreg.net]
   eid::kvmhost: [kvmdemw-fre-3a.komreg.net, kvmdemw-fre-3b.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net]
@@ -1496,7 +1505,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-1.komreg.net, natmd-2.komreg.net, natmd-test-2.komreg.net]
+    eumd-test-2.komreg.net, natmd-1.komreg.net, natmd-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,
@@ -1583,22 +1592,20 @@ members:
     relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
     validator-2.komreg.net, validator-test-1.komreg.net]
   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, natpub-test-2.komreg.net,
-    p1.komreg.net, p2.qa.komreg.net]
+    eupub-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, p1.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, md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
-    natmd-test-2.komreg.net]
+    md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net, natmd-2.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, md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net,
-    natmd-test-2.komreg.net]
+    md-eu1.qa.komreg.net, md1.komreg.net, natmd-1.komreg.net, natmd-2.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,
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net,
     md1.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-test-2.komreg.net]
-  metadatamgrs_new: [natpub-test-1.komreg.net]
+    natmd-test-2.komreg.net]
+  metadatamgrs_new: [natpub-test-1.komreg.net, natpub-test-2.komreg.net]
   nrpe: [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,
@@ -1642,10 +1649,10 @@ members:
     test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
     validator-test-1.komreg.net]
   sunet::fticks: [log.qa.sveidas.se]
-  sunet::metadata::mdq_publisher: [natpub-test-1.komreg.net]
-  sunet::metadata::mdqp: [natmd-test-1.komreg.net]
-  sunet::metadata::metadata_repo: [natmd-test-1.komreg.net]
-  sunet::metadata::pyff_compose: [natmd-test-1.komreg.net]
+  sunet::metadata::mdq_publisher: [natpub-test-1.komreg.net, natpub-test-2.komreg.net]
+  sunet::metadata::mdqp: [natmd-test-1.komreg.net, natmd-test-2.komreg.net]
+  sunet::metadata::metadata_repo: [natmd-test-1.komreg.net, natmd-test-2.komreg.net]
+  sunet::metadata::pyff_compose: [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,
@@ -1712,12 +1719,12 @@ members:
     kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, log-1.sveidas.se, log-1.test.sveidas.se,
     log-2.sveidas.se, log.qa.sveidas.se, md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net,
     monitor-tug-3.komreg.net, natmd-1.komreg.net, natmd-2.komreg.net, natmd-test-1.komreg.net,
-    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, natpub-test-2.komreg.net,
-    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se,
-    prid-2.sveidas.se, r1.komreg.net, refidp-1.qa.sveidas.se, refidp-1.test.sveidas.se,
-    relay-1.swedenconnect.se, test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net,
-    validator-2.komreg.net, validator-test-1.komreg.net]
-  sunetops_new: [natpub-test-1.komreg.net]
+    natmd-test-2.komreg.net, natpub-1.komreg.net, natpub-2.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se,
+    r1.komreg.net, refidp-1.qa.sveidas.se, refidp-1.test.sveidas.se, relay-1.swedenconnect.se,
+    test-1.qa.sveidas.se, test-1.test.sveidas.se, validator-1.komreg.net, validator-2.komreg.net,
+    validator-test-1.komreg.net]
+  sunetops_new: [natpub-test-1.komreg.net, natpub-test-2.komreg.net]
   swedenconnect_refidp: [refidp-1.qa.sveidas.se, refidp-1.test.sveidas.se]
   test_my_eid: [eidas-test-1.sveidas.se, eidas-test-2.sveidas.se, test-1.qa.sveidas.se,
     test-1.test.sveidas.se]