diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index a88c4cd..828200b 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1,40 +1,41 @@
+---
 # Note that the matching is done with re.match()
 .*\.sunet\.se$:
-   net:
-   infra_ca_rp:
-   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
-   sunet::server:
-      disable_all_local_users: true
-      disable_ipv6_privacy: true
-      install_scriptherder: true
-      unattended_upgrades: true
-   sunet::invent::client:
-      export_endpoint: https://ni-frontend-test.sunet.se
-      invent_retention_days: 1
+  net:
+  infra_ca_rp:
+  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
+  sunet::server:
+    disable_all_local_users: true
+    disable_ipv6_privacy: true
+    install_scriptherder: true
+    unattended_upgrades: true
+  sunet::invent::client:
+    export_endpoint: https://ni-frontend-test.sunet.se
+    invent_retention_days: 1
 
 metrics-cd-test-1.sunet.se:
-   sunet::certbot::acmed:
-   sunet::dockerhost2:
-   sunet::influx:
-      servicename: metrics-cd-test.sunet.se
-      influxdb2_tag: ci-docker-influxdb2-292
-      legacy_settings: false
-      influx_producer_networks:
-         - '130.242.121.23/32' # vpn1.sunet.se
-         - '192.36.171.97/32' # graph-internal-1.sunet.se
+  sunet::certbot::acmed:
+  sunet::dockerhost2:
+  sunet::influx:
+    servicename: metrics-cd-test.sunet.se
+    influxdb2_tag: ci-docker-influxdb2-292
+    legacy_settings: false
+    influx_producer_networks:
+      - '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:
@@ -59,38 +60,38 @@ monitornetops-sto1-prod-1.sunet.se:
       - /etc/naemon/conf.d/netops:/etc/naemon/conf.d/netops:ro
 
 pahol-test1.sunet.se:
-   sunet::baas2:
-      version: 8.1.22.0
-      install_tbmr: true
-      nodename: 6BA7708D7A1E
-      exclude_list:
-         - '/home/no-backup/.../*'
-         - '/root/no-backup/.../*'
+  sunet::baas2:
+    version: 8.1.22.0
+    install_tbmr: true
+    nodename: 6BA7708D7A1E
+    exclude_list:
+      - '/home/no-backup/.../*'
+      - '/root/no-backup/.../*'
 
 pypi-1.sunet.se:
-   sunet::pypi:
-   sunet::dockerhost2:
-   sunet::dehydrated::client:
-      domain: pypi.sunet.se
-   sunet::baas2:
-      nodename: A8P9U1IAR58I
-      backup_dirs:
-        - '/opt/pypi/packages'
-   sunet::server:
-      disable_ipv6_privacy: true
-      unattended_upgrades: true
-      ntpd_config: false
-      sshd_config: false
+  sunet::pypi:
+  sunet::dockerhost2:
+  sunet::dehydrated::client:
+    domain: pypi.sunet.se
+  sunet::baas2:
+    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:
+  sunet::certbot::acmed:
 
 karchive.sunet.se:
-   sunet::dockerhost2:
-   net::karchive:
-      docker_tag: latest
-      git_repo_url: ssh://git@platform.sunet.se:22022/Network/configuration-backup.git
-      git_user: /root
+  sunet::dockerhost2:
+  net::karchive:
+    docker_tag: latest
+    git_repo_url: ssh://git@platform.sunet.se:22022/Network/configuration-backup.git
+    git_user: /root
 
 lb-sthb-test-1.sunet.se:
   sunet::dockerhost2: