diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index d6462a9c..0347178b 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -1060,7 +1060,6 @@ classes:
     autoupdate: null
     common: null
     eid::dockerhost: {docker_repo: stable, version: '5:23.0.6-1~ubuntu.20.04~focal'}
-    eidas_hsm_client: null
     entropyclient: null
     infra_ca_rp: null
     konsulter: null
@@ -1070,6 +1069,13 @@ classes:
     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.fd
+      pyff_update_frequency: 1800
     sunet::rsyslog: null
     sunet::server: *id002
     sunetops: null
@@ -1488,8 +1494,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-1.komreg.net,
-    natmd-test-2.komreg.net]
+    eumd-test-2.komreg.net, natmd-1.komreg.net, natmd-2.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,
@@ -1636,6 +1641,7 @@ members:
   sunet::fticks: [log.qa.sveidas.se]
   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::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,