diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml
index 132716b..85d2563 100644
--- a/global/overlay/etc/hiera/data/common.yaml
+++ b/global/overlay/etc/hiera/data/common.yaml
@@ -7,6 +7,10 @@ nrpe_clients:
    - 2001:948:4:6::111    # nagiosxi.nordu.net
    - 89.47.184.128        # watcher.sunet.se
    - 2001:6b0:5a:4020::8e # watcher.sunet.se
+   - 89.47.190.84         # monitor-test.streams.sunet.se
+   - 2001:6b0:7d:40::3d   # monitor-test.streams.sunet.se
+nagios_ip_v4: 89.47.190.84
+nagios_ip_v6: 2001:6b0:7d:40::3d
 
 syslog_servers:
    - syslog.sunet.se:514
diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 8942605..1fe9461 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1,4 +1,5 @@
 .+:
+  sunet::nagios::nrpe:
   sunet::server:
   streams:
   sunet::invent::client: