diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml
index 87465ff8..eebce9f8 100644
--- a/global/overlay/etc/puppet/cosmos-db.yaml
+++ b/global/overlay/etc/puppet/cosmos-db.yaml
@@ -174,6 +174,16 @@ classes:
     nrpe: null
     sunet::rsyslog: null
     sunetops: null
+  monitor-fre-3.komreg.net:
+    autoupdate: null
+    common: null
+    entropyclient: null
+    infra_ca_rp: null
+    mailclient: *id001
+    nagios_monitor: null
+    nrpe: null
+    sunet::rsyslog: null
+    sunetops: null
   nic.komreg.net:
     autoupdate: null
     common: null
@@ -263,17 +273,18 @@ members:
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
-  autoupdate: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
-    jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, nic.komreg.net,
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
     p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+  autoupdate: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
+    jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, monitor-fre-3.komreg.net,
+    nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net,
+    web-1.qa.sveidas.se]
   common: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net,
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
   eid::dockerhost: [fe-fre-3.komreg.net]
   eid::kvmhost: [kvmfe-fre-3.komreg.net, kvminfra-fre-3.komreg.net]
   eidas_connector: [eidas-node-1.qa.sveidas.se]
@@ -282,15 +293,15 @@ members:
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
   github_client_credential: [web-1.qa.sveidas.se]
   infra_ca_rp: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net,
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
   konsulter: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
     jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, nic.komreg.net,
     prid-1.qa.sveidas.se]
@@ -298,19 +309,19 @@ members:
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
   md_publisher: [p1.komreg.net, p2.qa.komreg.net]
   md_repo_client: [md-eu1.qa.komreg.net]
   md_repo_server: [r1.komreg.net]
   md_signer: [md-eu1.qa.komreg.net, md1.komreg.net]
-  nagios_monitor: [nic.komreg.net]
+  nagios_monitor: [monitor-fre-3.komreg.net, nic.komreg.net]
   nrpe: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net,
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
   openstack_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se,
     md-eu1.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
   pages: [web-1.qa.sveidas.se]
@@ -324,8 +335,8 @@ members:
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
   sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net,
     md-eu1.qa.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se,
     r1.komreg.net, web-1.qa.sveidas.se]
@@ -333,6 +344,6 @@ members:
     jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net,
     kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net,
     kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net,
-    md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net,
-    prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]
+    md-eu1.qa.komreg.net, md1.komreg.net, monitor-fre-3.komreg.net, nic.komreg.net,
+    p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se]