diff --git a/.mrconfig b/.mrconfig
index 9af7980..99b662d 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -11,7 +11,7 @@ lib =
     nadir='https://git-nadir.immerda.ch/'
     riseup='git://labs.riseup.net/'
     sarava='git://git.sarava.org/'
-    shared='gitolite@labs.riseup.net:'
+    shared='git@gitlab.com::shared-puppet-modules-group/'
     varac_codecoop='https://git.codecoop.org/varacanero/'
     git_assure_remote() {
         remote="$1"
@@ -29,7 +29,7 @@ lib =
     }
 
 [apache]
-checkout = git clone ${shared}shared-apache apache
+checkout = git clone ${shared}apache apache
 update =
    git_assure_remote immerda ${immerda}module-apache.git
    git_assure_remote koumbit ${koumbit}puppet-apache.git
@@ -41,7 +41,7 @@ update =
    git remote update
 
 [apt]
-checkout = git clone ${shared}shared-apt apt
+checkout = git clone ${shared}apt apt
 update =
    git_assure_remote immerda ${immerda}module-apt.git
    git_assure_remote intrigeri ${intrigeri}puppet-module-apt.git
@@ -55,7 +55,7 @@ update =
    git remote update
 
 [augeas]
-checkout = git clone ${shared}shared-augeas augeas
+checkout = git clone ${shared}augeas augeas
 update =
    git_assure_remote leap ${leap}puppet_augeas
    git_assure_remote camptocamp git://github.com/camptocamp/puppet-augeas.git
@@ -64,7 +64,7 @@ update =
    git remote update
 
 [backupninja]
-checkout = git clone ${shared}shared-backupninja backupninja
+checkout = git clone ${shared}backupninja backupninja
 update = 
    git_assure_remote koumbit ${koumbit}puppet-backupninja.git
    git_assure_remote lavamind ${lavamind}module-backupninja
@@ -76,7 +76,7 @@ update =
    git remote update
 
 [check_mk]
-checkout = git clone ${shared}shared-check_mk check_mk
+checkout = git clone ${shared}check_mk check_mk
 update = 
    git_assure_remote leap ${leap}puppet_check_mk
    git_assure_remote riseup ${riseup}module_check_mk
@@ -84,7 +84,7 @@ update =
    git remote update
 
 [common]
-checkout = git clone ${shared}shared-common common
+checkout = git clone ${shared}common common
 update = 
    git_assure_remote nadir ${nadir}puppet-common.git
    git_assure_remote immerda ${immerda}module-common.git
@@ -98,7 +98,7 @@ update =
    git remote update
 
 [concat]
-checkout = git clone ${shared}shared-concat concat
+checkout = git clone ${shared}concat concat
 update = 
    git_assure_remote riseup ${riseup}module_concat
    git_assure_remote immerda ${immerda}module-concat.git
@@ -106,7 +106,7 @@ update =
    git remote update
 
 [cron]
-checkout = git clone ${shared}shared-cron cron
+checkout = git clone ${shared}cron cron
 update = 
    git_assure_remote lavamind ${lavamind}module-cron
    git_assure_remote immerda ${immerda}module-cron.git
@@ -116,13 +116,13 @@ update =
    git remote update
 
 [ekeyd]
-checkout = git clone ${shared}shared-ekeyd ekeyd
+checkout = git clone ${shared}ekeyd ekeyd
 update =
    git_assure_remote immerda ${immerda}module-ekeyd.git
    git remote update
 
 [git]
-checkout = git clone ${shared}shared-git git
+checkout = git clone ${shared}git git
 update = 
    git_assure_remote immerda ${immerda}module-git.git
    git_assure_remote koumbit ${koumbit}puppet-git.git
@@ -133,13 +133,13 @@ update =
    git remote update
 
 [iodine]
-checkout = git clone ${shared}shared-iodine iodine
+checkout = git clone ${shared}iodine iodine
 update =
    git_assure_remote immerda ${immerda}module-iodine.git
    git remote update
 
 [loginrecords]
-checkout = git clone ${shared}shared-loginrecords loginrecords
+checkout = git clone ${shared}loginrecords loginrecords
 update = 
    git_assure_remote immerda ${immerda}module-loginrecords.git
    git_assure_remote intrigeri ${intrigeri}puppet-module-loginrecords
@@ -147,7 +147,7 @@ update =
    git remote update
 
 [lsb]
-checkout = git clone ${shared}shared-lsb lsb
+checkout = git clone ${shared}lsb lsb
 update = 
    git_assure_remote immerda ${immerda}module-lsb
    git_assure_remote lavamind ${lavamind}module-lsb
@@ -158,7 +158,7 @@ update =
    git remote update
 
 [mod_security]
-checkout = git clone ${shared}shared-mod_security mod_security
+checkout = git clone ${shared}mod_security mod_security
 update = 
    git_assure_remote lavamind ${lavamind}module-mod_security
    git_assure_remote immerda ${immerda}module-mod_security.git
@@ -166,7 +166,7 @@ update =
    git remote update
 
 [monkeysphere]
-checkout = git clone ${shared}shared-monkeysphere monkeysphere
+checkout = git clone ${shared}monkeysphere monkeysphere
 update = 
    git_assure_remote immerda ${immerda}module-monkeysphere.git
    git_assure_remote mayfirst ${mayfirst}monkeysphere
@@ -174,7 +174,7 @@ update =
    git remote update
 
 [munin]
-checkout = git clone ${shared}shared-munin munin
+checkout = git clone ${shared}munin munin
 update = 
    git_assure_remote immerda ${immerda}module-munin.git
    git_assure_remote koumbit ${koumbit}puppet-munin.git
@@ -187,7 +187,7 @@ update =
    git remote update
 
 [mysql]
-checkout = git clone ${shared}shared-mysql mysql
+checkout = git clone ${shared}mysql mysql
 update = 
    git_assure_remote immerda ${immerda}module-mysql.git
    git_assure_remote lavamind ${lavamind}module-mysql
@@ -198,7 +198,7 @@ update =
    git remote update
 
 [nagios]
-checkout = git clone ${shared}shared-nagios nagios
+checkout = git clone ${shared}nagios nagios
 update = 
    git_assure_remote lavamind ${lavamind}module-nagios
    git_assure_remote immerda ${immerda}module-nagios
@@ -211,13 +211,13 @@ update =
    git remote update
 
 [openbsd]
-checkout = git clone ${shared}shared-openbsd openbsd
+checkout = git clone ${shared}openbsd openbsd
 update =
    git_assure_remote immerda ${immerda}module-openbsd.git
    git remote update
 
 [passenger]
-checkout = git clone ${shared}shared-passenger passenger
+checkout = git clone ${shared}passenger passenger
 update = 
    git_assure_remote riseup ${riseup}module_passenger
    git_assure_remote lavamind ${lavamind}module-passenger
@@ -227,14 +227,14 @@ update =
    git remote update
 
 [perl]
-checkout = git clone ${shared}shared-perl.git perl
+checkout = git clone ${shared}perl.git perl
 update =
    git_assure_remote riseup ${riseup}module_perl
    git_assure_remote immerda ${immerda}module-perl.git
    git remote update
 
 [postfix]
-checkout = git clone ${shared}shared-postfix postfix
+checkout = git clone ${shared}postfix postfix
 update = 
    git_assure_remote lavamind ${lavamind}module-postfix
    git_assure_remote nadir ${nadir}puppet-postfix.git
@@ -247,7 +247,7 @@ update =
    git remote update
 		
 [puppet]
-checkout = git clone ${shared}shared-puppet puppet
+checkout = git clone ${shared}puppet puppet
 update = 
    git_assure_remote fugit git@gitorious.org:puppet-common/puppet.git
    git_assure_remote immerda ${immerda}module-puppet.git
@@ -262,7 +262,7 @@ update =
    git remote update
 
 [rails]
-checkout = git clone ${shared}shared-rails rails
+checkout = git clone ${shared}rails rails
 update = 
    git_assure_remote immerda ${immerda}module-rails.git
    git_assure_remote lavamind ${lavamind}module-rails
@@ -272,7 +272,7 @@ update =
    git remote update
 
 [reprepro]
-checkout = git clone ${shared}shared-reprepro reprepro
+checkout = git clone ${shared}reprepro reprepro
 update =
    git_assure_remote intrigeri ${intrigeri}puppet-module-reprepro.git
    git_assure_remote leap ${leap}puppet_reprepro
@@ -280,7 +280,7 @@ update =
    git remote update
 
 [shorewall]
-checkout = git clone ${shared}shared-shorewall shorewall
+checkout = git clone ${shared}shorewall shorewall
 update = 
    git_assure_remote immerda ${immerda}module-shorewall.git
    git_assure_remote intrigeri ${intrigeri}puppet-module-shorewall
@@ -291,7 +291,7 @@ update =
    git remote update
 
 [sshd]
-checkout = git clone ${shared}shared-sshd sshd
+checkout = git clone ${shared}sshd sshd
 update = 
    git_assure_remote koumbit ${koumbit}puppet-sshd.git
    git_assure_remote intrigeri ${intrigeri}puppet-module-sshd.git
@@ -306,14 +306,14 @@ update =
    git remote update
 
 [strongswan]
-checkout = git clone ${shared}shared-strongswan strongswan
+checkout = git clone ${shared}strongswan strongswan
 update = 
    git_assure_remote immerda ${immerda}module-strongswan.git
    git_assure_remote leap ${leap}puppet_strongswan
    git remote update
 
 [stunnel]
-checkout = git clone ${shared}shared-stunnel stunnel
+checkout = git clone ${shared}stunnel stunnel
 update = 
    git_assure_remote immerda ${immerda}module-stunnel.git
    git_assure_remote riseup ${riseup}module_stunnel
@@ -322,7 +322,7 @@ update =
    git remote update
 
 [sudo]
-checkout = git clone ${shared}shared-sudo sudo
+checkout = git clone ${shared}sudo sudo
 update = 
    git_assure_remote immerda ${immerda}module-sudo.git
    git_assure_remote riseup ${riseup}module_sudo
@@ -331,7 +331,7 @@ update =
    git remote update
 
 [tor]
-checkout = git clone ${shared}shared-tor tor
+checkout = git clone ${shared}tor tor
 update =
    git_assure_remote riseup ${riseup}module_tor.git
    git_assure_remote sarava ${sarava}puppet-tor.git
@@ -339,7 +339,7 @@ update =
    git remote update
 
 [user]
-checkout = git clone ${shared}shared-user user
+checkout = git clone ${shared}user user
 update = 
    git_assure_remote immerda ${immerda}module-user.git
    git_assure_remote lavamind ${lavamind}module-user
@@ -349,7 +349,7 @@ update =
    git remote update
 
 [webhosting]
-checkout = git clone ${shared}shared-webhosting webhosting
+checkout = git clone ${shared}webhosting webhosting
 update = 
    git_assure_remote immerda ${immerda}module-webhosting.git
    git_assure_remote lavamind ${lavamind}module-webhosting