diff --git a/.gitlab-ci/default.yml b/.gitlab-ci/default.yml
index 4da36f65fae2e34dc4f8f6749bccaf1f5907b1f8..9080eb1ad08afada78aac9de98ac7ec703ba6ade 100644
--- a/.gitlab-ci/default.yml
+++ b/.gitlab-ci/default.yml
@@ -18,6 +18,7 @@ select tests:
   stage: configure
   script:
     - |
+      dunecontrol --opts=$DUNE_OPTS_FILE --current all
       if [[ "$TRIGGER_SOURCE" == "merge_request_event" ]]; then
           python3 bin/testing/getchangedfiles.py -o changedfiles.txt -t origin/$MR_TARGET_BRANCH_NAME
           python3 bin/testing/findtests.py -o affectedtests.json --file-list changedfiles.txt --build-dir build-cmake
@@ -27,15 +28,16 @@ select tests:
       fi
   artifacts:
     paths:
+      - build-cmake
       - affectedtests.json
     expire_in: 3 hours
 
 build dumux:
   stage: build
   script:
-    - dunecontrol --opts=$DUNE_OPTS_FILE --current all
     - |
       pushd build-cmake
+        make clean && make
         if [[ "$TRIGGER_SOURCE" == "merge_request_event" ]]; then
           python3 ../bin/testing/runselectedtests.py -c ../affectedtests.json -b
         else