diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15d00a4055e5949d8261b9c2e2e6b5abceb1ae96..fa674c70000f7ae03a29d54ee5b360e935e47da2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,31 +107,6 @@ variables:
     paths:
       - install
 
-# # temp template
-# .geomodel-build-template-viz: &geomodel-viz-job
-#   script:
-#     - echo "PWD; LS" # CI debug only
-#     - pwd; ls # CI debug only
-#     - ls dependencies-install
-#     - ls dependencies-install/lib/cmake/
-#     - ls ../ # CI debug only
-#     - ls ../../ # CI debug only
-#     - cmake --version # CI debug only
-#     - mkdir build
-#     - cd build
-#     - echo "CMAKE_ARGS - ${CMAKE_ARGS}"
-#     - echo "CMAKE_EXTRA_FLAGS - ${CMAKE_EXTRA_FLAGS}"
-#     - cmake ${CMAKE_ARGS} ${CMAKE_EXTRA_FLAGS} ..
-#     # - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../dependencies-install -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE ..
-#     - cmake --build . -- -j2 # using too many threads will cause weird compilation errors on the Ubuntu docker images...
-#     - cmake --build . -- install
-#     - pwd; ls # CI debug only
-#     - ls ../ # CI debug only
-#     - ls ../../ # CI debug only
-#   artifacts:
-#     paths:
-#       - install
-
 
 
 # ACTUAL JOBS
@@ -181,7 +156,7 @@ ubuntu-geomodel-base-builtinNlohmannXercesC:
     CMAKE_EXTRA_FLAGS: -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
 
 
-ubuntu-geomodeL-visualization-builtinNlohmannXercesC:
+ubuntu-geomodel-visualization-builtinNlohmannXercesC:
   <<: *ubuntu-job
   <<: *geomodel-job
   needs: ["ubuntu-coin", "ubuntu-soqt"]
@@ -189,3 +164,35 @@ ubuntu-geomodeL-visualization-builtinNlohmannXercesC:
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
     CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE
+
+ubuntu-geomodel-examples:
+  <<: *ubuntu-job
+  <<: *geomodel-job
+  stage: step-A
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_EXAMPLES=TRUE
+
+ubuntu-geomodel-examples-gmg4:
+  <<: *ubuntu-job
+  <<: *geomodel-job
+  stage: step-A
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_EXAMPLES_W_GEANT4=TRUE
+
+ubuntu-geomodel-gmg4:
+  <<: *ubuntu-job
+  <<: *geomodel-job
+  stage: step-A
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_GEOMODELG4=TRUE
+
+ubuntu-geomodel-fullsimlight:
+  <<: *ubuntu-job
+  <<: *geomodel-job
+  stage: step-A
+  variables:
+    CMAKE_ARGS: ${CMAKE_BASE_ARGS}
+    CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_FULLSIMLIGHT=TRUE