-bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.2-1
-sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-3
-nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@nodeimage-5.2-1
-myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.2-2
-# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.planet-lab.org/tests.git@master
+###
+rvm-ruby-BRANCH := planetlab
+rvm-ruby-GITPATH := git://git.onelab.eu/rvm-ruby.git@rvm-ruby-1.22.9-1
+oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1
+###
+bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.2-4
+sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-6
+nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@nodeimage-5.2-3
+myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.3-2
+
+#
+sfa-BRANCH := geni-v3
+sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-2
+#sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9
+#
+myslice-GITPATH := git://git.onelab.eu/myslice.git@master
+manifold-GITPATH := git://git.onelab.eu/manifold.git@devel
+#
+tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.3-2