diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 551726058aa7c5013b5696e1452f53f8f8793d5d..3c6f8358de4d95722ebaedb21908b7a4c805d0a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ stages:
 before_script:
   - git submodule update --init --recursive
   - source .gitlab/env.sh
-  - mkdir -p build-${VERSION}
+  - mkdir -p build
 
 include:
   - .gitlab/common.yml
diff --git a/.gitlab/build.yml b/.gitlab/build.yml
index a37e1bf03b7cec4f3ba804f6c464e254b7a0baef..ad5fb509ce8b0581c2f69530df27445baca076cc 100644
--- a/.gitlab/build.yml
+++ b/.gitlab/build.yml
@@ -8,10 +8,10 @@
     untracked: true
     paths:
       - install-${VERSION}
-      - build-${VERSION}
+      - build
       - spm-build-${VERSION}.log
   script:
-    - cd build-${VERSION}
+    - cd build
     - cmake -DSPM_CI_VERSION=${VERSION}
             -C ../.gitlab/ci-test-initial-cache.cmake  ..
     - make -j 4 | tee ../spm-build-${VERSION}.log
diff --git a/.gitlab/pages.yml b/.gitlab/pages.yml
index df11debb37310aafe10a5e8aac652a2ba7d135cd..c6d9d775b7391ee699777ba3f12e0b99b7fb3552 100644
--- a/.gitlab/pages.yml
+++ b/.gitlab/pages.yml
@@ -7,8 +7,8 @@ pages:
     paths:
       - public
   script:
-    - mkdir -p build-doc
-    - cd build-doc
+    - mkdir -p build
+    - cd build
     - cmake .. -DSPM_CI_VERSION=doc
             -C ../.gitlab/ci-test-initial-cache.cmake
     - make -j5
diff --git a/.gitlab/test.yml b/.gitlab/test.yml
index 6290fa9e6a089bfe8e307a178e39a087932fe656..5644423654bcef823b207fd8d499f7ce0a730560 100644
--- a/.gitlab/test.yml
+++ b/.gitlab/test.yml
@@ -10,14 +10,14 @@
       - spm-gcov-${VERSION}.log
   script:
     - source install-${VERSION}/bin/spm_env.sh
-    - (cd build-${VERSION} &&
+    - (cd build &&
        eval "ctest
              $TESTS_RESTRICTION
              -D ExperimentalTest
              -D ExperimentalCoverage
              -D ExperimentalSubmit
              | tee -a ../spm-build-${VERSION}.log")
-    - lcov --capture --directory build-${VERSION}
+    - lcov --capture --directory build
            -q --output-file spm-${VERSION}-${RUN}.lcov
            | tee -a spm-gcov-${VERSION}.log