diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
index 02a12f69..7ab76761 100644
--- a/global/overlay/etc/hiera/data/common.yaml
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -127,3 +127,13 @@ sunetops_ssh_keys:
     - 'mariah+CA747E57'
     - 'kjellman-000607431461'
     - 'leifj+neo'
+
+metadatamgrs_ssh_keys:
+  'root':
+    - 'jocar'
+    - 'bjorn-mattsson+000606484562'
+
+konsulter_ssh_keys:
+  'root':
+    - 'stefan_santesson'
+    - 'martin_lindstrom'
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 9bbd61ec..9cb43895 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -525,7 +525,7 @@ natpub-test-1.komreg.net:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
-   metadatamgrs:
+   metadatamgrs_new:
    sunet::metadata::mdq_publisher:
       valid_until: 7
    sunet::frontend::register_sites:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 605659a8..7bf64cad 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -1056,6 +1056,18 @@ class sunetops_new {
   }
 }
 
+class metadatamgrs_new {
+   sunet::ssh_keys { 'metadatamgrs':
+     config => safe_hiera('metadatamgrs_ssh_keys', {})
+   }
+}
+
+class konsulter_new {
+   sunet::ssh_keys { 'konsulter':
+     config => safe_hiera('konsulter_ssh_keys', {})
+   }
+}
+
 class nrpe {
   require apt
   class {'sunet::nagios': }