diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
index a7c4bf9b..45e24913 100644
--- a/global/overlay/etc/hiera/data/common.yaml
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -140,9 +140,6 @@ sunetops_ssh_keys:
     - 'bjorn+8E2DA8EB05F646D7'
     - 'jocar'
 
-metadatamgrs_ssh_keys:
-  'root':
-
 konsulter_ssh_keys:
   'root':
     - 'stefan_santesson'
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 09fc0a78..5e046e81 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -527,7 +527,6 @@ natpub-1.komreg.net:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
-   metadatamgrs_new:
    sunet::metadata::mdq_publisher:
       valid_until: 7
       xml_dir: role
@@ -545,7 +544,6 @@ natpub-test-1.komreg.net:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
-   metadatamgrs_new:
    sunet::metadata::mdq_publisher:
       valid_until: 7
       xml_dir: role
@@ -672,7 +670,6 @@ natpub-2.komreg.net:
    eid::dockerhost:
       version: '5:24.0.7-1~ubuntu.20.04~focal'
       storage_driver: 'overlay2'
-   metadatamgrs_new:
    sunet::metadata::mdq_publisher:
       valid_until: 7
       xml_dir: role
@@ -690,7 +687,6 @@ natpub-test-2.komreg.net:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
-   metadatamgrs_new:
    sunet::metadata::mdq_publisher:
       valid_until: 7
       xml_dir: role
@@ -765,7 +761,6 @@ p1.komreg.net:
    eid::dockerhost:
       version: '5:24.0.7-1~ubuntu.20.04~focal'
       storage_driver: 'overlay2'
-   metadatamgrs_new:
    sunet::metadata::mdq_publisher:
       valid_until: 7
       xml_dir: role
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 24f277de..9640fab9 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -1058,12 +1058,6 @@ 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', {})