diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 81e66fce..7fd1ccf1 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1264,8 +1264,8 @@ monitoreidas-prod-sto1-1.komreg.net:
          - jonas@sunet.se
       thruk_users:
          - '*@sunet.se'
-      default_host_group: sunet::nagios::nrpe
-      nrpe_group: sunet::nagios::nrpe
+      default_host_group: nrpe
+      nrpe_group: nrpe
 
 ### QA environment ###
 connector-qa-sto1-1.komreg.net:
@@ -1444,17 +1444,3 @@ testmyeid-test-sto3-1.komreg.net:
            - 'fe-fre-1.test.komreg.net'
            - 'fe-tug-1.test.komreg.net'
          port: '443'
-   sunet::nagios::nrpe:
-      checks:
-         - nrpe_check_apt
-         - nrpe_check_dynamic_disk
-         - nrpe_check_entropy
-         - nrpe_check_load
-         - nrpe_check_memory
-         - nrpe_check_ntp_time
-         - nrpe_check_reboot
-         - nrpe_check_scriptherder
-         - nrpe_check_total_procs_lax
-         - nrpe_check_uptime
-         - nrpe_check_users
-         - nrpe_check_zombie_procs