diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 040bf92..bc6348a 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -5,7 +5,6 @@
    sunet::server:
       disable_all_local_users: true
       disable_ipv6_privacy: true
-      fail2ban: true
       install_scriptherder: true
       unattended_upgrades: true
       ntpd_config: false
@@ -21,6 +20,26 @@ metrics-cd-test-1.sunet.se:
          - '130.242.121.23/32' # vpn1.sunet.se
          - '192.36.171.97/32' # graph-internal-1.sunet.se
 
+monitornetops-sto1-prod-1.sunet.se:
+  sunet::dockerhost2:
+  sunet::naemon_monitor:
+    domain: monitornetops.sunet.se
+    naemon_tag: v2024-03-05-01
+    thruk_tag: v2024-02-12-01
+    histou_tag: v2023-10-04-02
+    nagflux_tag: v2023-10-04-01
+    thruk_admins:
+      - mariah@sunet.se
+      - pahol@sunet.se
+      - paulo@sunet.se
+      - jonas@sunet.se
+      - salu@sunet.se
+      - thorslund@sunet.se
+    thruk_users:
+      - '*@sunet.se'
+    default_host_group: sunet::nagios::nrpe
+    nrpe_group: sunet::nagios::nrpe
+
 pahol-test1.sunet.se:
    sunet::baas2:
       version: 8.1.22.0
@@ -39,6 +58,11 @@ pypi-1.sunet.se:
       nodename: A8P9U1IAR58I
       backup_dirs:
         - '/opt/pypi/packages'
+   sunet::server:
+      disable_ipv6_privacy: true
+      unattended_upgrades: true
+      ntpd_config: false
+      sshd_config: false
 
 test-das-federator.lab.sunet.se:
    sunet::certbot::acmed:
diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules
index f52a2a7..183997b 100755
--- a/global/overlay/etc/puppet/setup_cosmos_modules
+++ b/global/overlay/etc/puppet/setup_cosmos_modules
@@ -98,6 +98,11 @@ def main():
     modulesfile_tmp: str = modulesfile + ".tmp"
 
     modules: dict = {
+        "nagioscfg": {
+            "repo": "https://github.com/SUNET/puppet-nagioscfg.git",
+            "upgrade": "yes",
+            "tag": "pahol-puppet8-compatibility-2024*",
+        },
         "sunet": {
             "repo": "https://github.com/SUNET/puppet-sunet.git",
             "upgrade": "yes",
@@ -120,8 +125,6 @@ def main():
             modules["sunet"]["tag"] = "pahol-influx*"
         if host_info["fqdn"] == "pahol-test1.sunet.se":
             modules["sunet"]["tag"] = "pahol-baas2-2*"
-        if host_info["fqdn"] == "pypi-1.sunet.se":
-            modules["sunet"]["tag"] = "pahol-pypi-dockerhost2*"
 
     # Build list of expected file content
     file_lines = create_file_content(modules)
diff --git a/monitornetops-sto1-prod-1.sunet.se/README b/monitornetops-sto1-prod-1.sunet.se/README
new file mode 100644
index 0000000..a18dac1
--- /dev/null
+++ b/monitornetops-sto1-prod-1.sunet.se/README
@@ -0,0 +1,3 @@
+
+The system documentation is in the docs directory of the multiverse repository.
+
diff --git a/monitornetops-sto1-prod-1.sunet.se/overlay/etc/hiera/data/local.eyaml b/monitornetops-sto1-prod-1.sunet.se/overlay/etc/hiera/data/local.eyaml
new file mode 100644
index 0000000..ff097c8
--- /dev/null
+++ b/monitornetops-sto1-prod-1.sunet.se/overlay/etc/hiera/data/local.eyaml
@@ -0,0 +1,2 @@
+---
+influx_password: ENC[PKCS7,MIIDBgYJKoZIhvcNAQcDoIIC9zCCAvMCAQAxggKOMIICigIBADByMFoxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxKzApBgNVBAMMIm1vbml0b3JuZXRvcHMtc3RvMS1wcm9kLTEuc3VuZXQuc2UCFA4W7XeLtMYRVaoYd2BkEoOfmm/vMA0GCSqGSIb3DQEBAQUABIICAAi7Tj4W5h9+wZQJlzuxNryeZAyzCo0NiTw0jnsqjKPIRdqClFnuuP12zEhgC2Cqn3AQFV9caQLRTubhlVxCOEXveL7/HUKy+Ba2GJXVSGdDQffDex6f6TiCcToNfzNCqlYCYNH4Mt2DrKT+kZLqTafyWvBCzH4oJl+4oTFF/SKcb2uoxf6fa7GlBA8/02zorbuCw5tcvIFCUSTSrAyahoPF3LkJazv8/YuHkWoYOme6q0FjkO44tb20lFCpqsYBFsAM+/UIi0njJa82YqB1tUhY4mKC8sFn7q9NQW+EEgQJhcAW8iBxsQ8/b+qlK+NMGcg9SPwYmCKZ4lnirWISC33pBvGuyJEWb8hiNVHuGWcdmW3v+AOhBIwTbtOuSXU/1wBlQlgLe+0x5qHlSiJDhifVwUWoONgWToI673yIZ82oey3XOHnUPpHUiOPqTZ1xhRfK37nXwxfSo0Q3DfJIqCtedaP87XJbRXZ+tYqvXk8HRKTZ8Ro14muEY+5LZfw143VZyqCsuoEz0v0JjOxvt79ie0oEeGo3a4z6lrIpBrSc8XpzSEb97id1PlsP/0236WIEYiemU3Qm3ViIbEoktLX5YtdP0qCf52bIHjOYkIqaU+Geff5CNcqWE0SbIWAwWH6/efc1VT4hU1xrSlulb1M7GlLDNNtGWT7ovhRhR1utMFwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEJz3G7QK8XN79OFsyIoiLfOAMJfWSALrqrz5H+IRCslGgMb49pXvrIaE4zgdP7UQS+ZIpjx7JnPOTEPEaCV0TVjLZA==]
diff --git a/pypi-1.sunet.se/overlay/etc/puppet/cosmos-modules.conf b/pypi-1.sunet.se/overlay/etc/puppet/cosmos-modules.conf
deleted file mode 100644
index 0bcd935..0000000
--- a/pypi-1.sunet.se/overlay/etc/puppet/cosmos-modules.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# name source (puppetlabs fq name or git url) upgrade (yes/no)
-#
-
-augeas      https://github.com/SUNET/puppet-augeas.git yes sunet-2*
-sunet       https://github.com/SUNET/puppet-sunet.git yes stable-2023v1-2*
-