diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index ec533859..d6462a9c 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1065,9 +1065,9 @@ classes:
     infra_ca_rp: null
     konsulter: null
     mailclient: *id001
-    md_signer: {dest_host: natpub-test-1.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::rsyslog: null
@@ -1584,7 +1584,7 @@ members:
   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-1.komreg.net, natmd-test-2.komreg.net]
+    natmd-test-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,
@@ -1634,6 +1634,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::mdqp: [natmd-test-1.komreg.net]
   sunet::metadata::metadata_repo: [natmd-test-1.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,