diff --git a/.mrconfig b/.mrconfig
index 090d612a731746caafb74fdd551fac983c5e67a9..73812293f8d226781836a64dfc09e5c1f6984f7f 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -1,16 +1,8 @@
 [DEFAULT]
 git_pullup = "$(dirname "$MR_CONFIG")/bin/pull-from-upstream"
 
-[swh-site]
-checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-site.git swh-site \
-	 && cd swh-site \
-	 && git checkout -b production origin/production
-
-[swh-profile]
-checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-profile.git swh-profile
-
-[swh-role]
-checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-role.git swh-role
+[private/swh-private-data]
+checkout = git clone git@forge.softwareheritage.org:/source/puppet-swh-private-data.git swh-private-data
 
 [swh-dar]
 checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-dar.git swh-dar
@@ -24,14 +16,24 @@ checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-mediaw
 [swh-postfix]
 checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-postfix.git swh-postfix
 
+[swh-profile]
+checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-profile.git swh-profile
+
+[swh-role]
+checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-role.git swh-role
+
+[swh-site]
+checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-site.git swh-site \
+	 && cd swh-site \
+	 && git checkout -b production origin/production
+
 [swh-systemd]
 checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-systemd.git swh-systemd
 
 [swh-uwsgi]
 checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-uwsgi.git swh-uwsgi
 
-[private/swh-private-data]
-checkout = git clone git@forge.softwareheritage.org:/source/puppet-swh-private-data.git swh-private-data
+## END SWH REPOS ##
 
 [claranet-varnish]
 checkout = git clone https://forge.softwareheritage.org/source/puppet-claranet-varnish.git claranet-varnish \
@@ -57,6 +59,18 @@ checkout = git clone https://forge.softwareheritage.org/source/puppet-inkblot-bi
 	 && git remote add upstream https://github.com/inkblot/puppet-bind \
 	 && git fetch upstream
 
+[mosen-cups]
+checkout = git clone https://forge.softwareheritage.org/source/puppet-mosen-cups.git mosen-cups \
+	 && cd mosen-cups \
+	 && git remote add upstream https://github.com/mosen/puppet-cups \
+	 && git fetch upstream
+
+[openstack-ceph]
+checkout = git clone https://forge.softwareheritage.org/source/puppet-openstack-ceph.git openstack-ceph \
+	 && cd openstack-ceph \
+	 && git remote add upstream https://github.com/openstack/puppet-ceph \
+	 && git fetch upstream
+
 [puppet-extlib]
 checkout = git clone https://forge.softwareheritage.org/source/puppet-puppet-extlib.git puppet-extlib \
 	 && cd puppet-extlib \
@@ -135,18 +149,6 @@ checkout = git clone https://forge.softwareheritage.org/source/puppet-puppetlabs
 	 && git remote add upstream https://github.com/puppetlabs/puppetlabs-vcsrepo\
 	 && git fetch upstream
 
-[mosen-cups]
-checkout = git clone https://forge.softwareheritage.org/source/puppet-mosen-cups.git mosen-cups \
-	 && cd mosen-cups \
-	 && git remote add upstream https://github.com/mosen/puppet-cups \
-	 && git fetch upstream
-
-[openstack-ceph]
-checkout = git clone https://forge.softwareheritage.org/source/puppet-openstack-ceph.git openstack-ceph \
-	 && cd openstack-ceph \
-	 && git remote add upstream https://github.com/openstack/puppet-ceph \
-	 && git fetch upstream
-
 [ripienaar-module_data]
 checkout = git clone https://forge.softwareheritage.org/source/puppet-ripienaar-module_data.git ripienaar-module_data \
 	 && cd ripienaar-module_data \