diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 12c3dc77..7263f8f3 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -504,9 +504,8 @@ natpub-1.komreg.net:
 natpub-test-1.komreg.net:
    autoupdate:
    metadatamgrs:
-   md_publisher:
-     keyname: natpub-test-1.komreg.net_infra
-     signer_ip_adress: '89.45.236.215'
+   sunet::metadata::mdq_publisher:
+      valid_until: 7
    sunet::frontend::register_sites:
      sites:
        'test.md.swedenconnect.se':
diff --git a/natpub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml b/natpub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml
index 0cf37786..73bf2f83 100644
--- a/natpub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml
+++ b/natpub-test-1.komreg.net/overlay/etc/hiera/data/local.yaml
@@ -1,2 +1,5 @@
-publisher_ssh_key: AAAAC3NzaC1lZDI1NTE5AAAAIBCp8IWCkQ9apLGj/cNmNFtJX68+k2CC36WOldwtJLZH
-publisher_ssh_key_type: ssh-ed25519
+signers:
+   natmd-test-1:
+      ipnumber: '89.45.236.215'
+      ssh_key: 'AAAAC3NzaC1lZDI1NTE5AAAAIBCp8IWCkQ9apLGj/cNmNFtJX68+k2CC36WOldwtJLZH root@natmd-test-1'
+      ssh_key_type: 'ssh-ed25519'