diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index d9bc18f1..df8c878a 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -516,11 +516,15 @@ eumd-test-1.komreg.net:
       version: 1.1.5-eidas
 
 natpub-1.komreg.net:
-   sunetops:
+   sunetops_new:
    autoupdate:
-   md_publisher:
-     keyname: natpub-1.komreg.net_infra
-     signer_ip_adress: '94.176.224.197'
+   eid::dockerhost:
+      version: '5:23.0.6-1~ubuntu.20.04~focal'
+   metadatamgrs_new:
+   sunet::metadata::mdq_publisher:
+      valid_until: 7
+      xml_dir: role
+      validate_cert: '/var/www/html/swedenconnect.se.cert'
    sunet::frontend::register_sites:
      sites:
        'md.swedenconnect.se':
diff --git a/natpub-2.komreg.net/overlay/etc/hiera/data/local.yaml b/natpub-2.komreg.net/overlay/etc/hiera/data/local.yaml
index 5308ba77..1bda198f 100644
--- a/natpub-2.komreg.net/overlay/etc/hiera/data/local.yaml
+++ b/natpub-2.komreg.net/overlay/etc/hiera/data/local.yaml
@@ -1,3 +1,10 @@
----
-publisher_ssh_key: AAAAC3NzaC1lZDI1NTE5AAAAIH3sk7S/Wb3RIGETd6st93OFaLihyy8u/2ZJOIIhlKTQ
-publisher_ssh_key_type: ssh-ed25519
+signers:
+   natmd-1:
+      ipnumber: '94.176.224.197'
+      ssh_key: 'AAAAC3NzaC1lZDI1NTE5AAAAIH3sk7S/Wb3RIGETd6st93OFaLihyy8u/2ZJOIIhlKTQ root@natmd-1'
+      ssh_key_type: 'ssh-ed25519'
+
+   natmd-2:
+      ipnumber: '94.176.224.69'
+      ssh_key: 'AAAAC3NzaC1lZDI1NTE5AAAAIH3sk7S/Wb3RIGETd6st93OFaLihyy8u/2ZJOIIhlKTQ root@natmd-2'
+      ssh_key_type: 'ssh-ed25519'