diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db250652fd4e3707a7859494b1516d1393543600..528a2e51c32af50b965368b9168557c1a174ced9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,47 +8,89 @@ before_script:
 
 stages:
   - build
+  - test
   - deploy
 
 build:main:
+  stage: build
   tags:
-    - docker
+    - demeter
   script:
     - CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --only=dorie all
-    - export PATH=/opt/dune/dorie/build-cmake/bin:$PATH
-    - ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
-    - ./dune-common/bin/dunecontrol --only=dorie make doc
-  stage: build
   artifacts:
-    name: "$CI_BUILD_NAME"
+    name: "$CI_JOB_NAME"
     paths:
-      - $CI_PROJECT_DIR/build-cmake/doc/html/
-    expire_in: 1 week
+      - $CI_PROJECT_DIR/build-cmake
+    expire_in: 3 days
 
 build:update_dune:
+  stage: build
   tags:
-    - docker
+    - demeter
+  only:
+    - master
   script:
-    - ./dune-common/bin/dunecontrol update || true
+    - ./dune-common/bin/dunecontrol update
     - ./dune-common/bin/dunecontrol exec "rm -rf build-cmake"
-    - CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol all
-    - export PATH=/opt/dune/dorie/build-cmake/bin:$PATH
-    - ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
-  stage: build
+    - CMAKE_FLAGS="-DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --module=dorie all
+  artifacts:
+    name: "$CI_JOB_NAME"
+    paths:
+      - $CI_PROJECT_DIR/build-cmake
+    expire_in: 3 days
 
 build:debug:
+  stage: build
   tags:
-    - docker
+    - demeter
   script:
-    - CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" ./dune-common/bin/dunecontrol --only=dorie all
-  stage: build
+    - CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DDUNE_PYTHON_VIRTUALENV_SETUP=True -DDUNE_PYTHON_ALLOW_GET_PIP=True" MAKE_FLAGS="-j 2" ./dune-common/bin/dunecontrol --only=dorie all
 
-deploy:docs:
+test:main:
+  stage: test
   tags:
-    - docker
+    - demeter
+  dependencies:
+    - build:main
+  allow_failure: true
   script:
-    - cd $CI_PROJECT_DIR && bash .deploy_docs
-  stage: deploy
+    - ./dune-common/bin/dunecontrol --only=dorie configure
+    - ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
+  artifacts:
+    name: "$CI_JOB_NAME"
+    paths:
+      - $CI_PROJECT_DIR/build-cmake/Testing
+    expire_in: 1 week
+
+test:update_dune:
+  stage: test
+  tags:
+    - demeter
+  dependencies:
+    - build:update_dune
   only:
     - master
   allow_failure: true
+  script:
+    - ./dune-common/bin/dunecontrol --only=dorie configure
+    - ARGS="--output-on-failure -j 2" ./dune-common/bin/dunecontrol --only=dorie make test
+  artifacts:
+    name: "$CI_JOB_NAME"
+    paths:
+      - $CI_PROJECT_DIR/build-cmake/Testing
+    expire_in: 1 week
+
+deploy:build_docs:
+  stage: deploy
+  tags:
+    - demeter
+  dependencies:
+    - build:main
+  script:
+    - ./dune-common/bin/dunecontrol --only=dorie configure
+    - ./dune-common/bin/dunecontrol --only=dorie make doc
+  artifacts:
+    name: "$CI_JOB_NAME"
+    paths:
+      - $CI_PROJECT_DIR/build-cmake/doc
+    expire_in: 1 week
\ No newline at end of file