diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efc9f47c0d1f9a90c62e03b42ded1135550c2f4f..c11ac3397247a0a4a0510325caf364c51fbf6336 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,34 +77,6 @@ build:simple:
     - mkdir -p build && cd build && cmake ../. -DCMAKE_INSTALL_PREFIX=/usr/local && make -j20 && make install  && cd ..
     - echo "Build successful."
 
-overlap_check_tgeo:
-  stage: test
-  needs: 
-    - ["common:detector"]
-  script:
-    - checkOverlaps -c ${DETECTOR_PATH}/athena.xml  | tee doc/overlap_check_tgeo.out 
-    - echo "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l) overlaps..."
-    - if [[ "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
-
-overlap_check_geant4:full:
-  stage: test
-  needs: 
-    - ["common:detector"]
-  script:
-    - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/athena.xml | tee doc/overlap_check_geant4.out
-    - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..."
-    - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
-
-overlap_check_geant4:inner_detector:
-  stage: test
-  needs: 
-    - ["common:detector"]
-  script:
-    - cp ${DETECTOR_PATH}/compact/subsystem_views/inner_detector.xml ${DETECTOR_PATH}/inner_detector.xml
-    - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/inner_detector.xml | tee doc/overlap_check_geant4.out
-    - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..."
-    - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
-
 .views:
   stage: docs
   before_script:
@@ -206,6 +178,34 @@ dump_constants:
   script:
     - npdet_info dump ${DETECTOR_PATH}/athena.xml  | tee doc/constants.out 
 
+overlap_check_tgeo:
+  stage: test
+  needs: 
+    - ["common:detector"]
+  script:
+    - checkOverlaps -c ${DETECTOR_PATH}/athena.xml  | tee doc/overlap_check_tgeo.out 
+    - echo "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l) overlaps..."
+    - if [[ "$(cat doc/overlap_check_tgeo.out | grep ovlp | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
+
+overlap_check_geant4:full:
+  stage: test
+  needs: 
+    - ["common:detector"]
+  script:
+    - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/athena.xml | tee doc/overlap_check_geant4.out
+    - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..."
+    - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
+
+overlap_check_geant4:inner_detector:
+  stage: test
+  needs: 
+    - ["common:detector"]
+  script:
+    - cp ${DETECTOR_PATH}/compact/subsystem_views/inner_detector.xml ${DETECTOR_PATH}/inner_detector.xml
+    - python scripts/checkOverlaps.py -c ${DETECTOR_PATH}/inner_detector.xml | tee doc/overlap_check_geant4.out
+    - echo "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l) overlaps..."
+    - if [[ "$(cat doc/overlap_check_geant4.out | grep GeomVol1002 | wc -l)" -gt "0" ]] ; then echo "Overlaps exist!" && false ; fi
+
 convert_to_gdml:
   stage: test
   needs: