diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14c36213e051f0af306b2d392af1f8da491ce289..39b032df8719fa2c6182cff8a1db74c9756bf971 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,13 @@ variables:
   GIT_DEPTH: 20
 
 stages:
-  - build
+  - clang
+  - alpine
+  - oldstable
+  - stable
+  - batocera
+  - testing
+  - win32
   - osxcross
 
 default:
diff --git a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
index 3a17e0933337da7573ea32dd146a1a1d9cd003ff..962f4fc54fec82c3bfab46635c12e8f733228cd8 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
@@ -1,5 +1,5 @@
 Alpine 3 GCC Makefile:
-  stage: build
+  stage: alpine
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml
index 56339e33251895f5ec3ed7c2e4378d098cbe7da4..30a2dee77cbd6bec77de5fb7faacde12b707c8e4 100644
--- a/.gitlab/ci/jobs/alpine-3-gcc.yml
+++ b/.gitlab/ci/jobs/alpine-3-gcc.yml
@@ -1,5 +1,5 @@
 Alpine 3 GCC:
-  stage: build
+  stage: alpine
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/batocera-arm64-makefile.yml b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
index e02497d40d7e190cac34bde6f7cb12c3cf755647..6b729195e57f8267fd0911d8a8b257e40196df2e 100644
--- a/.gitlab/ci/jobs/batocera-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
@@ -1,6 +1,8 @@
 batocera:arm64 Makefile:
   extends: Debian stable:arm64 Makefile
 
+  stage: batocera
+
   when: manual
 
   allow_failure: true
diff --git a/.gitlab/ci/jobs/batocera-arm64.yml b/.gitlab/ci/jobs/batocera-arm64.yml
index 3dcd73a0e2f422e84b5601a584d987a4bd0f2ed9..01bebc752987ab1bf5d9b89acc6511bc8b410477 100644
--- a/.gitlab/ci/jobs/batocera-arm64.yml
+++ b/.gitlab/ci/jobs/batocera-arm64.yml
@@ -1,6 +1,8 @@
 batocera:arm64:
   extends: Debian stable:arm64
 
+  stage: batocera
+
   when: manual
 
   allow_failure: true
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
index bd4a927419ad65ce51745214b44500f84751209a..9f54349e04350f838ff1190b39a16e871e6a765a 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
@@ -1,6 +1,8 @@
 Debian oldstable:amd64 Makefile:
   extends: Debian stable:amd64 Makefile
 
+  stage: oldstable
+
   when: manual
 
   image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64.yml b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
index 231e8485d71d5a50e94c1ecc08fb140549595e5e..90f6fd7336afd85daf12d63c4c4facf95b80779b 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
@@ -1,6 +1,8 @@
 Debian oldstable:amd64:
   extends: Debian stable:amd64
 
+  stage: oldstable
+
   when: manual
 
   image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
index 426934bf97d9cae2875ec1bd4ed8dff7ad58af68..4009fee3fb1c72f9ff08d961e50ede3b965907a5 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
@@ -1,6 +1,8 @@
 Debian oldstable:arm64 Makefile:
   extends: Debian stable:arm64 Makefile
 
+  stage: oldstable
+
   when: manual
 
   image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64.yml b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
index 76d401309d07df3ee312b85488c09a9dd0fd28fb..75b5631998497184f4d7dd88a085dc8a61c241e8 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
@@ -1,6 +1,8 @@
 Debian oldstable:arm64:
   extends: Debian stable:arm64
 
+  stage: oldstable
+
   when: manual
 
   image: git.do.srb2.org:5050/stjr/srb2ci/srb2ci:oldstable
diff --git a/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
index fee52c5a793015212c397c2907f1b927489ea93a..5d30dfe021c9aa25e54139801e3f801a7b0d38c0 100644
--- a/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
@@ -1,7 +1,7 @@
 Debian stable:amd64 Makefile:
   extends: .srb2ci
 
-  stage: build
+  stage: stable
 
   artifacts:
     paths:
diff --git a/.gitlab/ci/jobs/debian-stable-amd64.yml b/.gitlab/ci/jobs/debian-stable-amd64.yml
index e58f5a112ca5a203d255dc6a9732ed46626d8f15..7377cfe1d6f0ceac71cfcb24ec44871c2c32e904 100644
--- a/.gitlab/ci/jobs/debian-stable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-amd64.yml
@@ -1,7 +1,7 @@
 Debian stable:amd64:
   extends: .srb2ci
 
-  stage: build
+  stage: stable
 
   artifacts:
     paths:
diff --git a/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
index aa0ea3780bc3aad545ce70b2667374a62b839673..b00ebe7e0b7b481b972379ced985272e2b40e268 100644
--- a/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
@@ -1,7 +1,7 @@
 Debian stable:arm64 Makefile:
   extends: .srb2ci
 
-  stage: build
+  stage: stable
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-stable-arm64.yml b/.gitlab/ci/jobs/debian-stable-arm64.yml
index 135d87aa5942bf87f0f79cf3e982e9e345debe74..d3446cd775da7c12092d1cd7f901fefbba9372ca 100644
--- a/.gitlab/ci/jobs/debian-stable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-stable-arm64.yml
@@ -1,7 +1,7 @@
 Debian stable:arm64:
   extends: .srb2ci
 
-  stage: build
+  stage: stable
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
index 0b8e6e50ced49cc19948e27d8e96657d2541251a..1296a33472a62a5c2fb5a74a8383522167ddb3c0 100644
--- a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
+++ b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
@@ -1,7 +1,7 @@
 Debian stable Clang:
   extends: .srb2ci
 
-  stage: build
+  stage: clang
 
   when: on_success
 
diff --git a/.gitlab/ci/jobs/debian-stable-i386-makefile.yml b/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
index dd572ec383c489d3414a312348806f47c65f3cbc..acf757556cb1c72ae3789c751a9a7221c5359953 100644
--- a/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
+++ b/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
@@ -1,7 +1,7 @@
 Debian stable:i386 Makefile:
   extends: .srb2ci
 
-  stage: build
+  stage: stable
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-stable-i386.yml b/.gitlab/ci/jobs/debian-stable-i386.yml
index 970b92a69c6f00ff508a0126bd1b82962f8e5c48..ff3dbface60900af2685066bd7cb033a682f571d 100644
--- a/.gitlab/ci/jobs/debian-stable-i386.yml
+++ b/.gitlab/ci/jobs/debian-stable-i386.yml
@@ -1,7 +1,7 @@
 Debian stable:i386:
   extends: .srb2ci
 
-  stage: build
+  stage: stable
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
index 1165b1fea3e9ef2eb8db122f51a3dcb14174b15b..e3cc0925689491ca02e29a50374e48223a02949a 100644
--- a/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64-makefile.yml
@@ -1,7 +1,7 @@
 Debian testing GCC Makefile:
   extends: .srb2ci
 
-  stage: build
+  stage: testing
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
index fc998ea47b78b10476e72d6605c9ecfe6ea54009..fbad8dfb367fb9f40188a627f0275a8cd0193e36 100644
--- a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
+++ b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
@@ -1,7 +1,7 @@
 Debian testing GCC:
   extends: .srb2ci
 
-  stage: build
+  stage: testing
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml
index 1c89000c2f540bc1b1251f66aba833a6557ad9f9..6067444e86042fb6d91587267bdbdf874976d3b7 100644
--- a/.gitlab/ci/jobs/macos-arm64.yml
+++ b/.gitlab/ci/jobs/macos-arm64.yml
@@ -1,14 +1,13 @@
 osxcross arm64:
   extends: .srb2ci
 
-  stage: build
+  stage: osxcross
 
   artifacts:
     paths:
       - "build.arm64/bin/"
       - "build.arm64/dist/arm64.h"
       - "build.arm64/src/config.h"
-    expose_as: "Mac arm64"
     name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-arm64-apple-darwin21.4"
 
   variables:
diff --git a/.gitlab/ci/jobs/windows-x64-makefile.yml b/.gitlab/ci/jobs/windows-x64-makefile.yml
index 8da30d2b9822fd42c90f00df2d061284d1c753ef..8fdc5307398b34bbe05e8b1d35fdd519892baedf 100644
--- a/.gitlab/ci/jobs/windows-x64-makefile.yml
+++ b/.gitlab/ci/jobs/windows-x64-makefile.yml
@@ -1,7 +1,7 @@
 Windows x64 Makefile:
   extends: .srb2ci
 
-  stage: build
+  stage: win32
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/windows-x64.yml b/.gitlab/ci/jobs/windows-x64.yml
index 36f12e308da6c090413850989920282db0ecd08c..b44097044579d03a13280510aede1df743507886 100644
--- a/.gitlab/ci/jobs/windows-x64.yml
+++ b/.gitlab/ci/jobs/windows-x64.yml
@@ -1,7 +1,7 @@
 Windows x64:
   extends: .srb2ci
 
-  stage: build
+  stage: win32
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/windows-x86-makefile.yml b/.gitlab/ci/jobs/windows-x86-makefile.yml
index 213342cda81e119827937a79df8b1f74242d7ef2..d81baf2f12dffb66003700dbb585802d2f79c0a7 100644
--- a/.gitlab/ci/jobs/windows-x86-makefile.yml
+++ b/.gitlab/ci/jobs/windows-x86-makefile.yml
@@ -1,7 +1,7 @@
 Windows x86 Makefile:
   extends: .srb2ci
 
-  stage: build
+  stage: win32
 
   when: on_success
 
diff --git a/.gitlab/ci/jobs/windows-x86.yml b/.gitlab/ci/jobs/windows-x86.yml
index 7a298731d1343b0941ff36de8f62648784934588..22b799cda03c0367a7c580082fa73ab425dd5855 100644
--- a/.gitlab/ci/jobs/windows-x86.yml
+++ b/.gitlab/ci/jobs/windows-x86.yml
@@ -1,7 +1,7 @@
 Windows x86:
   extends: .srb2ci
 
-  stage: build
+  stage: win32
 
   cache:
     - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG