diff --git a/.mrconfig b/.mrconfig
index 68cdf56..77b4f62 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -1,109 +1,109 @@
 [swh-site]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/swh-site \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPSITE/swh-site.git \
 	 && cd swh-site \
 	 && git checkout -b production origin/production
 
 [swh-profile]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/swh-profile
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPPROF/swh-profile.git
 
 [swh-role]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/swh-role
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPROLE/swh-role.git
 
 [swh-dar]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/swh-dar
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPDAR/swh-dar.git
 
 [swh-postfix]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/swh-postfix
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPPFIX/swh-postfix.git
 
 [private/swh-private-data]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/private/swh-private-data
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPPRIV/swh-private-data
 
 [inkblot-bind]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/inkblot-bind \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPBIND/inkblot-bind.git \
 	 && cd inkblot-bind \
 	 && git remote add upstream https://github.com/inkblot/puppet-bind \
 	 && git fetch upstream
 
 [puppetlabs-apache]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/puppetlabs-apache \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPAPA/puppetlabs-apache.git \
 	 && cd puppetlabs-apache \
 	 && git remote add upstream https://github.com/puppetlabs/puppetlabs-apache \
 	 && git fetch upstream
 
 [puppetlabs-ntp]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/puppetlabs-ntp \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPNTP/puppetlabs-ntp.git \
 	 && cd puppetlabs-ntp \
 	 && git remote add upstream https://github.com/puppetlabs/puppetlabs-ntp \
 	 && git fetch upstream
 
 [puppetlabs-stdlib]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/puppetlabs-stdlib \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPSTD/puppetlabs-stdlib.git \
 	 && cd puppetlabs-stdlib \
 	 && git remote add upstream https://github.com/puppetlabs/puppetlabs-stdlib \
 	 && git fetch upstream
 
 [puppetlabs-concat]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/puppetlabs-concat \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPCAT/puppetlabs-concat.git \
 	 && cd puppetlabs-concat \
 	 && git remote add upstream https://github.com/puppetlabs/puppetlabs-concat \
 	 && git fetch upstream
 
 [puppetlabs-mysql]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/puppetlabs-mysql \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPMY/puppetlabs-mysql.git \
 	 && cd puppetlabs-mysql \
 	 && git remote add upstream https://github.com/puppetlabs/puppetlabs-mysql \
 	 && git fetch upstream
 
 [ripienaar-module_data]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/ripienaar-module_data \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPMOD/ripienaar-module_data.git \
 	 && cd ripienaar-module_data \
 	 && git remote add upstream https://github.com/ripienaar/puppet-module-data \
 	 && git fetch upstream
 
 [rlenglet-debconf_package]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/rlenglet-debconf_package \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPDEBP/rlenglet-debconf_package.git \
 	 && cd rlenglet-debconf_package \
 	 && git remote add upstream https://github.com/rlenglet/puppet-debconf_package \
 	 && git fetch upstream
 
 [saz-locales]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/saz-locales \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPLOC/saz-locales.git \
 	 && cd saz-locales \
 	 && git remote add upstream https://github.com/saz/puppet-locales \
 	 && git fetch upstream
 
 [saz-ssh]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/saz-ssh \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPSSH/saz-ssh.git \
 	 && cd saz-ssh \
 	 && git remote add upstream https://github.com/saz/puppet-ssh \
 	 && git fetch upstream
 
 [saz-sudo]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/saz-sudo \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPSUDO/saz-sudo.git \
 	 && cd saz-sudo \
 	 && git remote add upstream https://github.com/saz/puppet-sudo \
 	 && git fetch upstream
 
 [ssm-munin]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/ssm-munin \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPMUN/ssm-munin.git \
 	 && cd ssm-munin \
 	 && git remote add upstream https://github.com/ssm/ssm-munin \
 	 && git fetch upstream
 
 [theforeman-puppet]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/theforeman-puppet \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPPUP/theforeman-puppet.git \
 	 && cd theforeman-puppet \
 	 && git remote add upstream https://github.com/theforeman/puppet-puppet \
 	 && git fetch upstream
 
 [thias-php]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/thias-php \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPPHP/thias-php.git \
 	 && cd thias-php \
 	 && git remote add upstream https://github.com/thias/puppet-php \
 	 && git fetch upstream
 
 [trepasi-debnet]
-checkout = git clone git@git.softwareheritage.org:swh/sysadm/puppet/trepasi-debnet \
+checkout = git clone git@forge.softwareheritage.org:/diffusion/SPDEBN/trepasi-debnet.git \
 	 && cd trepasi-debnet \
 	 && git remote add upstream https://github.com/rtib/tib-debnet \
 	 && git fetch upstream