diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules
index c3ea5eff..df635b64 100755
--- a/global/overlay/etc/puppet/setup_cosmos_modules
+++ b/global/overlay/etc/puppet/setup_cosmos_modules
@@ -160,7 +160,7 @@ def main():
             "tag": f"eidas-{host_info['environment']}-2*",
         },
         "pyff": {
-            "repo": "https://github.com/samlbits/puppet-pyff.git",
+            "repo": "https://github.com/SUNET/puppet-pyff.git",
             "upgrade": "yes",
             "tag": f"eidas-{host_info['environment']}-2*",
         },
@@ -170,7 +170,7 @@ def main():
             "tag": f"eidas-{host_info['environment']}-2*",
         },
         "varnish": {
-            "repo": "https://github.com/samlbits/puppet-varnish.git",
+            "repo": "https://github.com/SUNET/puppet-varnish.git",
             "upgrade": "yes",
             "tag": f"eidas-{host_info['environment']}-2*",
         },