diff --git a/.gitlab-ci.d/init_x86_64-mac1011-clang70.sh b/.gitlab-ci.d/init_x86_64-mac1011-clang70.sh
index a28a88c4fc613e3ff42f9f37aed624cc7e830ace..d4f98eeefeebfbf8073ea4fb1df3d55ef4c7dd95 100644
--- a/.gitlab-ci.d/init_x86_64-mac1011-clang70.sh
+++ b/.gitlab-ci.d/init_x86_64-mac1011-clang70.sh
@@ -1,58 +1,69 @@
-#!/bin/bash
- 
-# General variables
-export MACRELEASES=/Users/gitlab-runner/CI
+# -------------------------------------------------------------------- ---
+
+# ---  Use the same compiler and python as used for the installation   ---
+
+# -------------------------------------------------------------------- ---
+export PATH=/usr/bin:/usr/bin:${PATH}
+export LD_LIBRARY_PATH=/usr/lib:/usr/lib64:/usr/lib:${LD_LIBRARY_PATH}
+
 
 #--------------------------------------------------------------------------------
-#     CLHEP
+#     ROOT
 #--------------------------------------------------------------------------------
+export ROOTSYS="/Users/gitlab-runner/CI/root_v6.06.02"
+export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
+export PATH="$ROOTSYS/bin:$PATH"
+export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
 
-export CLHEP=$MACRELEASES/clhep-2.3.1.0
+
+#--------------------------------------------------------------------------------
+#     CLHEP
+#--------------------------------------------------------------------------------
+export CLHEP="/Users/gitlab-runner/CI/clhep-2.2.0.4"
 export CLHEP_BASE_DIR="$CLHEP"
 export CLHEP_INCLUDE_DIR="$CLHEP/include"
 export PATH="$CLHEP_BASE_DIR/bin:$PATH"
 export LD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$LD_LIBRARY_PATH"
-export DYLD_LIBRARY_PATH="$CLHEP_BASE_DIR/lib:$DYLD_LIBRARY_PATH"
 
 #--------------------------------------------------------------------------------
-#     Geant4    
+#     DD4hep
 #--------------------------------------------------------------------------------
-
-export G4INSTALL=$MACRELEASES/geant4.10.02
-export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
-export G4SYSTEM="Linux-g++"
+export DD4hepINSTALL=`pwd`
+export DD4HEP=`pwd`
+export PYTHONPATH="$DD4HEP/python:$DD4HEP/DDCore/python:$PYTHONPATH"
+export PATH="$DD4HEP/bin:$PATH"
+export LD_LIBRARY_PATH="$DD4HEP/lib:$LD_LIBRARY_PATH"
 
 #--------------------------------------------------------------------------------
-#     ROOT
+#     LCIO
 #--------------------------------------------------------------------------------
+export LCIO="/Users/gitlab-runner/CI/lcio/HEAD"
+export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH"
+export PATH="$LCIO/tools:$LCIO/bin:$PATH"
+export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
 
-export ROOTSYS=$MACRELEASES/root-6.06.02
-export PYTHONPATH="$ROOTSYS/lib:$PYTHONPATH"
-export PATH="$ROOTSYS/bin:$PATH"
-export LD_LIBRARY_PATH="$ROOTSYS/lib:$LD_LIBRARY_PATH"
-export DYLD_LIBRARY_PATH="$ROOTSYS/lib:$DYLD_LIBRARY_PATH"
 
 #--------------------------------------------------------------------------------
-#     LCIO
+#     Geant4
 #--------------------------------------------------------------------------------
+export G4INSTALL="/Users/gitlab-runner/CI/geant4.10.01.p01"
+export G4ENV_INIT="$G4INSTALL/bin/geant4.sh"
+export G4SYSTEM="Darwin-g++"
 
-export LCIO=$MACRELEASES/lcio
-export PYTHONPATH="$LCIO/src/python:$LCIO/examples/python:$PYTHONPATH"
-export PATH="$LCIO/tools:$LCIO/bin:$PATH"
-export LD_LIBRARY_PATH="$LCIO/lib:$LD_LIBRARY_PATH"
-export DYLD_LIBRARY_PATH="$LCIO/lib:$DYLD_LIBRARY_PATH"
 
 #--------------------------------------------------------------------------------
 #     Boost
 #--------------------------------------------------------------------------------
-
-export BOOST_ROOT=$MACRELEASES/boost_1.60
+export BOOST_ROOT="/Users/gitlab-runner/CI/boost_1.60"
 
 #--------------------------------------------------------------------------------
-#     XercesC
+#     CMake
 #--------------------------------------------------------------------------------
 
-export XercesC_HOME=$MACRELEASES/xerces-c-3.1.3
-export PATH="$XercesC_HOME/bin:$PATH"
-export LD_LIBRARY_PATH="$XercesC_HOME/lib:$LD_LIBRARY_PATH"
-export DYLD_LIBRARY_PATH="$XercesC_HOME/lib:$DYLD_LIBRARY_PATH"
+# --- source GEANT4 INIT script ---
+test -r ${G4ENV_INIT} && { cd $(dirname ${G4ENV_INIT}) ; . ./$(basename ${G4ENV_INIT}) ; cd $OLDPWD ; }
+
+# --- set DYLD_LIBRARY_PATH to LD_LIBRARY_PATH for MAC compatibility ---
+export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DYLD_LIBRARY_PATH
+
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d82908a3e9ad834992722e53aac31577f63058e..424dee0926306b968f30f95367e96975765a5cae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,22 +9,9 @@ slc6-gcc48:
     - 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
-    - make test    
-
-slc6-gcc48-desy:
-  tags:
-    - docker
-  image: clicdp/slc6-base
-  script:
-    - source .gitlab-ci.d/init_x86_64-slc6-gcc48-opt-desy.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.1 -D DD4HEP_USE_CXX11=ON ..
-    - make -j4
-    - make install
+    - source ../bin/thisdd4hep.sh
     - make test
 
-    
 slc6-gcc49:
   tags:
     - docker
@@ -36,6 +23,7 @@ slc6-gcc49:
     - 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
+    - source ../bin/thisdd4hep.sh
     - make test
 
 centos7-gcc49:
@@ -49,16 +37,6 @@ centos7-gcc49:
     - 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
+    - source ../bin/thisdd4hep.sh
     - make test
 
-mac1011-clang70:
-  tags:
-    - mac
-  script:
-    - source .gitlab-ci.d/init_x86_64-mac1011-clang70.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/lib/Geant4-10.2.0 -D DD4HEP_USE_CXX11=ON ..
-    - make -j2
-    - make install
-    - make test