diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 78ae6656..417a1159 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -14,11 +14,13 @@ jmp.komreg.net:
    sunet_iaas_cloud:
    autoupdate:
    sunet::auditd:
+   jumphosts:
 
 '^jump-.+\.komreg\.net$':
    konsulter:
    metadatamgrs:
    autoupdate:
+   jumphosts:
 
 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 e9aae72e..cbf1ff00 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -14,6 +14,8 @@ class autoupdate {
    class { 'sunet::updater': cron => true, cosmos_automatic_reboot => true }
 }
 
+class jumphosts {}
+
 class infra_ca_rp {
    sunet::ici_ca::rp { 'infra': }
 }
@@ -683,7 +685,7 @@ class nagios_monitor {
       contact_groups => ['alerts']
    }
    nagioscfg::service {'service_ssh':
-      hostgroup_name => ['all'],
+      hostgroup_name => ['jumphost'],
       description    => 'SSH',
       check_command  => 'check_ssh_4_hostname',
       contact_groups => ['alerts']