diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fe4ae22d16cf4fded32ac747e286910a2e44a4f..6c1b1c48c0bdbcc3b95bbac982f36dc73d438809 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,45 @@
 slc6-gcc48:
   tags:
     - docker
-  image: cern/slc6-base
+  image: clicdp/slc6-base
   script:
     - yum install which man -y
-    - cd /afs/cern.ch/user/m/mpetric/public/root
-    - . ./bin/thisroot.sh 
+    - source .gitlab-ci.d/init_x86_64-slc6-gcc48-opt.sh
+    - mkdir build 
+    - cd build
+    - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX11=ON ..        
+    - make -j4
+    - make install
+    - . ../cmake/thisdd4hep_test.sh
+    - make test
+
+slc6-gcc49:
+  tags:
+    - docker
+  image: clicdp/slc6-base
+  script:
+    - yum install which	man -y
+    - source .gitlab-ci.d/init_x86_64-slc6-gcc49-opt.sh
+    - mkdir build 
+    - cd build
+    - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX14=ON ..        
+    - make -j3
+    - make install
+    - . ../bin/thisdd4hep.sh
+    - make test
+
+centos7-gcc49:
+  tags:
+    - docker
+  image: clicdp/cc7-base
+  script:
+    - yum install which	man -y
+    - source .gitlab-ci.d/init_x86_64-centos7-gcc49-opt.sh
+    - mkdir build 
+    - cd build
+    - cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -DCLHEP_DIR=$CLHEP -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.0 -D DD4HEP_USE_CXX14=ON ..        
+    - make -j3
+    - make install
+    - . ../bin/thisdd4hep.sh
+    - make test
+