diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules
index aa910ef..dc3dc58 100755
--- a/global/overlay/etc/puppet/setup_cosmos_modules
+++ b/global/overlay/etc/puppet/setup_cosmos_modules
@@ -113,12 +113,18 @@ def main():
             "upgrade": "yes",
            "tag": "sunet-2*",
         },
+        "matrix": {
+            "repo": "https://platform.sunet.se/matrix/matrix-puppet.git",
+            "upgrade": "yes",
+            "tag": "stable-2*",
+        }
     }
 
     # When/if we want we can do stuff to modules here
     if host_info:
         if host_info["environment"] == "test":
             modules["sunet"]["tag"] = "testing-2*"
+            modules["matrix"]["tag"] = "testing-2*"
     #   if host_info["fqdn"] == "k8sw1.matrix.test..sunet.se":
     #       modules["sunet"]["tag"] = "mandersson-test*" 
     # Build list of expected file content