diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 6fda9ff8..9a1ee8eb 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1133,7 +1133,6 @@ classes:
     entropyclient: null
     infra_ca_rp: null
     mailclient: *id001
-    md_publisher: {keyname: natpub-test-1.komreg.net_infra, signer_ip_adress: 89.45.236.215}
     metadatamgrs: null
     nrpe: null
     sunet::frontend::register_sites:
@@ -1141,6 +1140,7 @@ classes:
         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}
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -1581,8 +1581,8 @@ 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-1.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, natpub-test-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]
@@ -1639,6 +1639,7 @@ 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]