diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
index 1f984e50..b3dbcd39 100644
--- a/global/overlay/etc/hiera/data/common.yaml
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -27,6 +27,12 @@ nrpe_clients:
    - 94.176.224.229
    - 94.176.224.101
 
+mgmt_addresses:
+    - 94.176.224.114     # jump-tug-3.komreg.net
+    - 2001:6b0:64:5::114 # jump-tug-3.komreg.net
+    - 94.176.224.242     # jump-fre-3.komreg.net
+    - 2001:6b0:64:5::242 # jump-fre-3.komreg.net
+
 ssh_authorized_keys:
 
   'mariah+CA747E57':
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index cd610053..1c734634 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -7,6 +7,8 @@
    mailclient:
       domain: sunet.se
    sunet::rsyslog:
+   sunet::server:
+      sshd_config: true
 
 jmp.komreg.net:
    konsulter:
@@ -21,6 +23,8 @@ jmp.komreg.net:
    metadatamgrs:
    autoupdate:
    jumphosts:
+   sunet::server:
+      ssh_allow_from_anywhere: true
 
 kvmfe-tug-3.komreg.net:
    eid::kvmhost:
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 56b647ab..2524b8e4 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -658,9 +658,6 @@ class sunetops {
     'pypi'  => false,
     default => true,
   }
-  class { 'sunet::server':
-    sshd_config => $sshd_config,
-  }
 
   # SSH config, create SSH authorized keys from Hiera
   $ssh_authorized_keys = hiera_hash('ssh_authorized_keys', undef)