diff --git a/Puppetfile b/Puppetfile
index 15eab0e3..e2527826 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,216 +1,216 @@
 mod 'dar',
-    :git => 'https://forge.softwareheritage.org/source/puppet-swh-dar',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/puppet-swh-dar',
     :branch => :control_branch,
     :default_branch => 'master'
 
 mod 'gunicorn',
-    :git => 'https://forge.softwareheritage.org/source/puppet-swh-gunicorn',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/puppet-swh-gunicorn',
     :branch => :control_branch,
     :default_branch => 'master'
 
 mod 'mediawiki',
-    :git => 'https://forge.softwareheritage.org/source/puppet-swh-mediawiki',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/puppet-swh-mediawiki',
     :branch => :control_branch,
     :default_branch => 'master'
 
 mod 'postfix',
-    :git => 'https://forge.softwareheritage.org/source/puppet-swh-postfix',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/puppet-swh-postfix',
     :branch => :control_branch,
     :default_branch => 'master'
 
 mod 'uwsgi',
-    :git => 'https://forge.softwareheritage.org/source/puppet-swh-uwsgi',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/puppet-swh-uwsgi',
     :branch => :control_branch,
     :default_branch => 'master'
 
 mod 'apache',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-apache',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-apache',
     :tag => 'v7.0.0'
 
 mod 'apt',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-apt',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-apt',
     :tag => 'v8.3.0'
 
 mod 'archive',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-archive',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-archive',
     :tag => 'v6.0.2'
 
 mod 'bind',
-    :git => 'https://forge.softwareheritage.org/source/puppet-inkblot-bind',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-inkblot-bind',
     :ref => '7.4.0'
 
 mod 'cassandra',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-cassandra',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-cassandra',
     :ref => 'master'
 
 mod 'ceph',
-    :git => 'https://forge.softwareheritage.org/source/puppet-openstack-ceph',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-openstack-ceph',
     :ref => 'master'
 
 mod 'concat',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-concat',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-concat',
     :tag => 'v7.1.1'
 
 mod 'cups',
-    :git => 'https://forge.softwareheritage.org/source/puppet-mosen-cups',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-mosen-cups',
     :ref => 'master'
 
 mod 'datacat',
-    :git => 'https://forge.softwareheritage.org/source/puppet-richardc-datacat',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-richardc-datacat',
     :ref => '0.6.2'
 
 mod 'debconf',
-    :git => 'https://forge.softwareheritage.org/source/puppet-stm-debconf',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-stm-debconf',
     :ref => 'v4.1.0'
 
 mod 'debnet',
-    :git => 'https://forge.softwareheritage.org/source/puppet-trepasi-debnet',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-trepasi-debnet',
     :ref => '8d856df078352a8848a43ca0ee9f2ef9086b343a'
 
 mod 'docker',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-docker',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-docker',
     :ref => 'v4.1.2'
 
 mod 'elasticsearch',
-    :git => 'https://forge.softwareheritage.org/source/puppet-elastic-elasticsearch',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-elastic-elasticsearch',
     :ref => '6.4.0'
 
 mod 'extlib',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-extlib',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-extlib',
     :tag => 'v5.3.0'
 
 mod 'grafana',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-grafana',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-grafana',
     :ref => 'feature/puppet5-compat'
 
 mod 'hitch',
-    :git => 'https://forge.softwareheritage.org/source/puppet-ssm-hitch',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-ssm-hitch',
     :ref => 'feature/additional-config-0.1.5'
 
 mod 'icinga2',
-    :git => 'https://forge.softwareheritage.org/source/puppet-icinga-icinga2',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-icinga-icinga2',
     :tag => 'v3.2.1'
 
 mod 'icingaweb2',
-    :git => 'https://forge.softwareheritage.org/source/puppet-icinga-icingaweb2',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-icinga-icingaweb2',
     :tag => 'v3.2.1'
 
 mod 'inifile',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-inifile',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-inifile',
     :ref => 'v5.2.0'
 
 mod 'java',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-java',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-java',
     :tag => 'v7.3.0'
 
 mod 'java_ks',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-java_ks',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-java_ks',
     :tag => 'v4.2.0'
 
 mod 'kafka',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-kafka',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-kafka',
     :ref => 'v8.0.0'
 
 mod 'keycloak',
-    :git => 'https://forge.softwareheritage.org/source/puppet-treydock-keycloak',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-treydock-keycloak',
     # Need to upgrade to keycloak 12 before bumping to 7.x
     :ref => 'v6.26.0'
 
 mod 'letsencrypt',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-letsencrypt',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-letsencrypt',
     :ref => 'v7.0.0'
 
 mod 'locales',
-    :git => 'https://forge.softwareheritage.org/source/puppet-saz-locales',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-saz-locales',
     :ref => 'v3.1.0'
 
 mod 'mysql',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-mysql',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-mysql',
     :ref => 'v12.0.1'
 
 mod 'nginx',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-nginx',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-nginx',
     :ref => 'v3.3.0'
 
 mod 'ntp',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-ntp',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-ntp',
     :ref => 'v9.1.0'
 
 mod 'php',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-php',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-php',
     :ref => 'v8.0.2'
 
 mod 'postgresql',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-postgresql',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-postgresql',
     :ref => 'v7.5.0'
 
 mod 'pgbouncer',
-    :git => 'https://forge.softwareheritage.org/source/puppet-covermymeds-pgbouncer',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-covermymeds-pgbouncer',
     :ref => '9ec0d8a1255bbb309c2ff38f229167209cad496b'
 
 mod 'puppet',
-    :git => 'https://forge.softwareheritage.org/source/puppet-theforeman-puppet',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-theforeman-puppet',
     :ref => 'latest_passenger'
 
 mod 'puppetdb',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-puppetdb',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-puppetdb',
     :ref => '7.10.0'
 
 mod 'memcached',
-    :git => 'https://forge.softwareheritage.org/source/puppet-saz-memcached',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-saz-memcached',
     :ref => 'v7.0.0'
 
 mod 'rabbitmq',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-rabbitmq',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-rabbitmq',
     :ref => 'v11.1.0'
 
 mod 'redis',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-redis',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-redis',
     :ref => 'v8.2.0'
 
 mod 'resolv_conf',
-    :git => 'https://forge.softwareheritage.org/source/puppet-saz-resolv_conf',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-saz-resolv_conf',
     :ref => 'v5.0.0'
 
 mod 'ssh',
-    :git => 'https://forge.softwareheritage.org/source/puppet-saz-ssh',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-saz-ssh',
     :ref => 'v8.0.0'
 
 mod 'stdlib',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-stdlib',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-stdlib',
     :ref => 'v8.1.0'
 
 mod 'sudo',
-    :git => 'https://forge.softwareheritage.org/source/puppet-saz-sudo',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-saz-sudo',
     :ref => 'v7.0.2'
 
 mod 'systemd',
-    :git => 'https://forge.softwareheritage.org/source/puppet-camptocamp-systemd',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-camptocamp-systemd',
     # camptocamp/puppet-systemd 3.x dropped explicit systemctl daemon-reload
     # calls in favor of the built-in support in Puppet 6.1. We use Puppet 5.5.x,
     # so we can't upgrade this module.
     :ref => '2.12.0'
 
 mod 'timezone',
-    :git => 'https://forge.softwareheritage.org/source/puppet-saz-timezone',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-saz-timezone',
     :ref => 'v6.1.0'
 
 mod 'unattended_upgrades',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppet-unattended_upgrades',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppet-unattended_upgrades',
     :ref => 'v6.0.0'
 
 mod 'varnish',
-    :git => 'https://forge.softwareheritage.org/source/puppet-claranet-varnish',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-claranet-varnish',
     :ref => 'bugfix/systemd-unit'
 
 mod 'vcsrepo',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-vcsrepo',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-vcsrepo',
     :ref => 'v5.0.0'
 
 mod 'zfs_core',
-    :git => 'https://forge.softwareheritage.org/source/puppet-puppetlabs-zfs_core',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-puppetlabs-zfs_core',
     :ref => '1.0.0'  # Higher versions not compatible with puppet < 6.0
 
 mod 'zookeeper',
-    :git => 'https://forge.softwareheritage.org/source/puppet-deric-zookeeper',
+    :git => 'https://gitlab.softwareheritage.org/infra/puppet/3rdparty/puppet-deric-zookeeper',
     :ref => 'v1.2.1'