diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c95a916e7ba26bb877df111a75f53b9c1a58e5a..deba97a284a1cf7eb844c2d2f9da37d5f635058c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,45 +1,49 @@
 variables:
-  GIT_SSL_NO_VERIFY: "true"
   GIT_SUBMODULE_STRATEGY: "recursive"
   GIT_DEPTH: "3"
   NAMESPACE: pyrene-dev
   PROJECT: talos_metapkg_ros_control_sot
-  IMAGE: "${CI_REGISTRY}/${NAMESPACE}/${PROJECT}"
+  REGISTRY: gepgitlab.laas.fr:4567
+  IMAGE: "${REGISTRY}/${NAMESPACE}/${PROJECT}"
+  CCACHE_BASEDIR: "${CI_PROJECT_DIR}"
+  CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
 
 cache:
   paths:
-    - build/ccache
+    - ccache
 
 
 .robotpkg-talos-metapkg-ros-control-sot: &robotpkg-talos-metapkg-ros-control-sot
   variables:
     ROBOTPKG: talos-metapkg-ros-control-sot
     CATEGORY: wip
+  except:
+    - gh-pages
   before_script:
-    - mkdir -p build/ccache
-    - cd build
-    - export CCACHE_BASEDIR=${PWD}
-    - export CCACHE_DIR=${PWD}/ccache
+    - mkdir -p ccache
   script:
     - cd /root/robotpkg/${CATEGORY}/${ROBOTPKG}
     - git pull
-    - echo "MASTER_REPOSITORY = git ${CI_PROJECT_DIR}" >> Makefile
-    - echo "REPOSITORY.talos-metapkg-ros-control-sot = git ${CI_PROJECT_DIR}" >> /opt/openrobots/etc/robotpkg.conf
-    - make checkout
+    - make checkout MASTER_REPOSITORY="dir ${CI_PROJECT_DIR}"
     - make install
-    - cd work.*/${PROJECT}*/
-  except:
-    - gh-pages
+    - cd work.$(hostname)/$(make show-var VARNAME=DISTNAME)
+    
+    
 
 
 robotpkg-talos-metapkg-ros-control-sot-14.04:
   <<: *robotpkg-talos-metapkg-ros-control-sot
   image: ${IMAGE}:14.04
 
+
 robotpkg-talos-metapkg-ros-control-sot-16.04:
   <<: *robotpkg-talos-metapkg-ros-control-sot
   image: ${IMAGE}:16.04
-  
+
+
 robotpkg-talos-metapkg-ros-control-sot-dubnium:
   <<: *robotpkg-talos-metapkg-ros-control-sot
   image: ${IMAGE}:dubnium
+
+
+