diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85082c1480f6c14024135f01720aebc9a949d26a..b7bb934e619c1349560d14d3500592aad1177a2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 stages:
   - deps-geomodelcore
-#  - deps-CLHEP
   - deps-xerces-c
   - deps-Geant4
   - build
@@ -21,7 +20,7 @@ variables:
     - export PATH="/usr/local/opt/qt/bin:$PATH" # to make Qt5 discoverable by CMake
 
 .ubuntu-template-job: &ubuntu-job
-  image: gitlab-registry.cern.ch/mbandier/geant4-ubuntu/base-image:latest
+  image: gitlab-registry.cern.ch/mbandier/geant4-ubuntu/base-image:1.1
   tags:
     - docker
   before_script: 
@@ -43,25 +42,6 @@ variables:
     paths:
       - install
 
-#.CLHEP-build-template-job: &CLHEP-job
-#  stage: deps-CLHEP
-#  variables:
-#    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
-#  script:
-#    - pwd; ls
-#    - git clone https://gitlab.cern.ch/CLHEP/CLHEP.git
-#    - cd CLHEP
-#    - git checkout CLHEP_2_4_1_0
-#    - cd ../
-#    - mkdir CLHEP-build
-#    - cd CLHEP-build
-#    - cmake ${CMAKE_ARGS} ../CLHEP
-#    - make -j32
-#    - make install
-#  artifacts:
-#    paths:
-#      - install
-
 .xerces-c-build-template-job: &xerces-c-job
   stage: deps-xerces-c
   variables:
@@ -122,10 +102,6 @@ geomodelcore-mac:
   <<: *macos-job
   <<: *geomodelcore-job
 
-#CLHEP-mac:
-#  <<: *macos-job
-#  <<: *CLHEP-job
-
 xerces-c-mac:
   <<: *macos-job
   <<: *xerces-c-job
@@ -146,10 +122,6 @@ geomodelcore-ubuntu:
   <<: *ubuntu-job
   <<: *geomodelcore-job
 
-#CLHEP-ubuntu:
-#  <<: *ubuntu-job
-#  <<: *CLHEP-job
-
 #geomodelio-ubuntu:
 #  <<: *ubuntu-job
 #  <<: *geomodelio-job
@@ -162,7 +134,7 @@ geomodelcore-ubuntu:
 # Geant4-ubuntu:
 #   <<: *ubuntu-job
 #   <<: *Geant4-job
-#   needs: ["CLHEP-ubuntu", "xerces-c-ubuntu"]
+#   needs: ["xerces-c-ubuntu"]
 
 geomodelg4-ubuntu:
   <<: *ubuntu-job