diff --git a/Makefile b/Makefile
index 7a38367eec75a258b04875ad2c09ee6ef55982cf..c66f02555c76c63e696765b2bc6b899826e27263 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,13 @@ PYTHON_PIP_VERSION?=pip==9.0.3
 ifeq ($(NRP_INSTALL_MODE),user)
         include user_makefile
 else
-        CI_REPO?=ssh://bbpcode.epfl.ch/platform/ContinuousIntegration.git
-        CI_DIR?=ContinuousIntegration
+        CI_REPO?=git@bitbucket.org:hbpneurorobotics/admin-scripts.git
+        CI_DIR?=$(HBP)/admin-scripts/ContinuousIntegration
+        THIS_DIR:=$(PWD)
 
         FETCH_CI := $(shell \
                 if [ ! -d $(CI_DIR) ]; then \
-                        git clone $(CI_REPO) $(CI_DIR) > /dev/null ;\
+                        cd $(HBP) && git clone $(CI_REPO) > /dev/null && cd $(THIS_DIR);\
                 fi;\
                 echo $(CI_DIR) )