diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31f0217211a77eadec9ee359c9cc5ddd55d7c8e6..2fba43cde60c646c3a0f630a24de0baf770dd2a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,41 +1,21 @@
-default:   
- tags: ['docker']   
- image: registry.gitlab.inria.fr/solverstack/docker/distrib
+default:
+ tags: ['ci.inria.fr']
+ image: registry.gitlab.inria.fr/solverstack/docker/base
 
-stages:
-  - build
-  - doc
-  - pages
+variables:
+  GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
 
-cmake:
+doc:
   stage: build
-  artifacts:
-    name: cpp_tools_build
-    expire_in: 1 day
-    paths:
-      - build/
   script:
-    - mkdir build && cd build && cmake ..
-        -Dcpp_tools_BUILD_DOC=ON
-        -DCMAKE_C_COMPILER=gcc
-        -DCMAKE_CXX_COMPILER=g++
-
-doc:
-  stage: doc 
-  dependencies:
-    - cmake
+    - cmake -B build -Dcpp_tools_BUILD_DOC=ON
+    - cmake --build build/ --target doc
   artifacts:
-    name: cpp_tools_doc
-    expire_in: 1 day
     paths:
-      - build/docs/doxygen/html
-  script:
-    - cd build && make doc
+      - build/
 
 pages:
-  stage: pages
-  dependencies:
-    - doc
+  stage: deploy
   artifacts:
     paths:
       - public