diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 12f4df24..9db00888 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -913,6 +913,28 @@ class nrpe {
   sunet::nagios::nrpe_command {'check_needrestart':
       command_line => "sudo /usr/sbin/needrestart -p -l"
   }
+  exec { "create_${name}_service_dir":
+    command => '/bin/mkdir -p /etc/systemd/system/nagios-nrpe-server.service.d/',
+    unless  => '/usr/bin/test -d /etc/systemd/system/nagios-nrpe-server.service.d/',
+  }
+  exec { "${name}_daemon_reload":
+    command     => 'systemctl daemon-reload',
+    refreshonly => true,
+  }
+
+  $str = "# Some NRPE checks will get fishy results when using a PrivateTmp.
+# E.g check_apt: https://askubuntu.com/questions/1415415/check-apt-issue-with-nagios
+[Service]
+PrivateTmp=false"
+
+  file {
+    '/etc/systemd/system/nagios-nrpe-server.service.d/privatetmp.conf':
+      ensure  => file,
+      mode    => '0444',
+      content => $str,
+      require => [Exec["create_${name}_service_dir"], Package[nagios-nrpe-server]],
+      notify  =>  [Exec["${name}_daemon_reload"],Service[nagios-nrpe-server]],
+  }
 }
 
 class redis_cluster_node {
diff --git a/relay-1.swedenconnect.se/overlay/etc/hiera/data/local.yaml b/relay-1.swedenconnect.se/overlay/etc/hiera/data/local.yaml
index 233261d9..ed97d539 100644
--- a/relay-1.swedenconnect.se/overlay/etc/hiera/data/local.yaml
+++ b/relay-1.swedenconnect.se/overlay/etc/hiera/data/local.yaml
@@ -1,13 +1 @@
 ---
-submission_ip:
-   - 193.10.93.2        # sunet test ip
-   - 2001:6b0:7:c::/64  # sunet test ip
-   - 109.105.111.111    # nagiosxi.nordu.net
-   - 2001:948:4:6::111  # nagiosxi.nordu.net
-   - 85.235.7.170	      # idm
-   - 94.176.224.229     # monitor-fre-3
-   - 2001:6b0:64:4::229 # monitor-fre-3
-   - 94.176.224.101     # monitor-tug-3
-   - 2001:6b0:63:4::101 # monitor-tug-3
-   - 89.47.184.215      # nic
-   - 2001:6b0:5a:4020::330 # nic
diff --git a/relay-2.swedenconnect.se/overlay/etc/hiera/data/local.yaml b/relay-2.swedenconnect.se/overlay/etc/hiera/data/local.yaml
index 6a435ce8..09331336 100644
--- a/relay-2.swedenconnect.se/overlay/etc/hiera/data/local.yaml
+++ b/relay-2.swedenconnect.se/overlay/etc/hiera/data/local.yaml
@@ -1,17 +1,4 @@
 ---
-submission_ip:
-   - 193.10.93.2        # sunet test ip
-   - 2001:6b0:7:c::/64  # sunet test ip
-   - 109.105.111.111    # nagiosxi.nordu.net
-   - 2001:948:4:6::111  # nagiosxi.nordu.net
-   - 85.235.7.170	      # idm
-   - 94.176.224.229     # monitor-fre-3
-   - 2001:6b0:64:4::229 # monitor-fre-3
-   - 94.176.224.101     # monitor-tug-3
-   - 2001:6b0:63:4::101 # monitor-tug-3
-   - 89.47.184.215      # nic
-   - 2001:6b0:5a:4020::330 # nic
-
 relay_ip:
    - 89.47.185.206
    - 2001:6b0:5a:4020::225
diff --git a/relay-common/overlay/etc/hiera/data/group.yaml b/relay-common/overlay/etc/hiera/data/group.yaml
new file mode 100644
index 00000000..3ad20606
--- /dev/null
+++ b/relay-common/overlay/etc/hiera/data/group.yaml
@@ -0,0 +1,23 @@
+---
+submission_ip:
+   - 193.10.93.2        # sunet test ip
+   - 2001:6b0:7:c::/64  # sunet test ip
+   - 109.105.111.111    # nagiosxi.nordu.net
+   - 2001:948:4:6::111  # nagiosxi.nordu.net
+   - 85.235.7.170	      # idm
+   - 94.176.224.229     # monitor-fre-3
+   - 2001:6b0:64:4::229 # monitor-fre-3
+   - 94.176.224.101     # monitor-tug-3
+   - 2001:6b0:63:4::101 # monitor-tug-3
+   - 89.47.184.215      # nic
+   - 2001:6b0:5a:4020::330 # nic
+   - 89.45.236.223 # idm-sto3-qa-app-2.komreg.net
+   - 89.45.237.180 # idm-sto3-test-app-3.komreg.net
+   - 89.47.184.15 # idm-sto1-qa-app-1.komreg.net
+   - 89.47.184.233 # idm-sto1-qa-app-3.komreg.net
+   - 89.47.185.124 # idm-sto1-test-app-1.komreg.net
+   - 2001:6b0:5a:4020::328 # idm-sto1-qa-app-1.komreg.net
+   - 2001:6b0:5a:4020::c2 # idm-sto1-qa-app-3.komreg.net
+   - 2001:6b0:5a:4020::2fe # idm-sto1-test-app-1.komreg.net
+   - 2001:6b0:40::3c # idm-sto3-qa-app-2.komreg.net
+   - 2001:6b0:40::22f # idm-sto3-test-app-3.komreg.net