diff --git a/Makefile b/Makefile
index ebc9d9d7e4c52e718855d3ce2857b0c7f054dfd6..b379286b85fc33af3e5c1751bfe4bf7536df068a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,17 +16,19 @@ PYTHON_PIP_VERSION?=pip==9.0.3
 ##### DO NOT MODIFY BELOW #####################
 
 ifeq ($(NRP_INSTALL_MODE),user)
+        $(shell cp -af $(HBP)/user-scripts/config_files/platform_venv/* $(VIRTUAL_ENV)/lib/python2.7/site-packages/ )
         include user_makefile
 else
-        CI_REPO?=ssh://bbpcode.epfl.ch/platform/ContinuousIntegration.git
-        CI_DIR?=ContinuousIntegration
+        $(shell cp -af $(HBP)/user-scripts/config_files/platform_venv/* $(VIRTUAL_ENV)/lib/python2.7/site-packages/ )
+        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) )
 
         include $(FETCH_CI)/python/common_makefile
 endif
-
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 33a8df501537ad2f714c131c4aae01cd5f2f1f5e..7bbdb7ecc765576388ee71b5a043e23474c12f4f 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -16,7 +16,6 @@ pipelines:
           - cd $BITBUCKET_CLONE_DIR
 
           # Configure build
-          - ln -s $HBP/admin-scripts/ContinuousIntegration
           - export VIRTUAL_ENV_PATH=$VIRTUAL_ENV
           - export NRP_INSTALL_MODE=dev
           - export PYTHONPATH=hbp_nrp_virtual_coach:$VIRTUAL_ENV_PATH/lib/python2.7/site-packages:$PYTHONPATH