diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules
index 4732c8d..62a7d63 100755
--- a/global/overlay/etc/puppet/setup_cosmos_modules
+++ b/global/overlay/etc/puppet/setup_cosmos_modules
@@ -85,45 +85,44 @@ def main():
             "upgrade": "yes",
             "tag": "stable-2023v1-2*",
         },
-        "augeas": {
-            "repo": "https://github.com/SUNET/puppet-augeas.git",
-            "upgrade": "yes",
-            "tag": "sunet-2*",
-        },
-        "concat": {
-            "repo": "https://github.com/SUNET/puppetlabs-concat.git",
-            "upgrade": "yes",
-            "tag": "sunet-2*",
-        },
-        "stdlib": {
-            "repo": "https://github.com/SUNET/puppetlabs-stdlib.git",
-            "upgrade": "yes",
-            "tag": "sunet-2*",
-        },
-        "apt": {
-            "repo": "https://github.com/SUNET/puppetlabs-apt.git",
-            "upgrade": "yes",
-            "tag": "sunet-2*",
-        },
-        "docker": {
-            "repo": "https://github.com/SUNET/garethr-docker.git",
-            "upgrade": "yes",
-            "tag": "sunet-2*",
-        },
     }
 
     if OS_INFO:
-        # Provided by Debian/Ubuntu via
-        # https://github.com/SUNET/multiverse/blob/main/global/pre-tasks.d/030puppet
 
-        if (OS_INFO["ID"] == "debian" and int(OS_INFO["VERSION_ID"]) >= 12) or (
-            OS_INFO["ID"] == "ubuntu"
-            and debian_support.version_compare(OS_INFO["VERSION_ID"], "24.04") >= 0
+        # Exceptions for ubuntu22
+        if (OS_INFO["ID"] == "ubuntu"
+            and debian_support.version_compare(OS_INFO["VERSION_ID"], "22.04") <= 0
         ):
-            del modules["augeas"]
-            del modules["apt"]
-            del modules["concat"]
-            del modules["stdlib"]
+            augeas_module = {
+                "repo": "https://github.com/SUNET/puppet-augeas.git",
+                "upgrade": "yes",
+                "tag": "sunet-2*",
+            }
+            modules.update[augeas_module]
+            apt_module = {
+                "repo": "https://github.com/SUNET/puppetlabs-apt.git",
+                "upgrade": "yes",
+                "tag": "sunet-2*",
+            }
+            modules.update[apt_module]
+            concat_module = {
+                "repo": "https://github.com/SUNET/puppetlabs-concat.git",
+                "upgrade": "yes",
+                "tag": "sunet-2*",
+            }
+            modules.update[concat_module]
+            stdlib_module = {
+                "repo": "https://github.com/SUNET/puppetlabs-stdlib.git",
+                "upgrade": "yes",
+                "tag": "sunet-2*",
+            }
+            modules.update[stdlib_module]
+            vcsrepo_module = {
+                "repo": "https://github.com/SUNET/puppetlabs-vcsrepo.git",
+                "upgrade": "yes",
+                "tag": "sunet-2*",
+            }
+            modules.update[vcsrepo_module]
 
         # Make test machines use special test branch of puppet-sunet:
         if OS_INFO["ID"] == "ubuntu":