diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39b032df8719fa2c6182cff8a1db74c9756bf971..14c36213e051f0af306b2d392af1f8da491ce289 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,13 +11,7 @@ variables:
   GIT_DEPTH: 20
 
 stages:
-  - clang
-  - alpine
-  - oldstable
-  - stable
-  - batocera
-  - testing
-  - win32
+  - build
   - osxcross
 
 default:
diff --git a/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml b/.gitlab/ci/jobs/alpine-3-gcc-makefile.yml
index 962f4fc54fec82c3bfab46635c12e8f733228cd8..3a17e0933337da7573ea32dd146a1a1d9cd003ff 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: alpine
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/alpine-3-gcc.yml b/.gitlab/ci/jobs/alpine-3-gcc.yml
index 30a2dee77cbd6bec77de5fb7faacde12b707c8e4..56339e33251895f5ec3ed7c2e4378d098cbe7da4 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: alpine
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/batocera-arm64-makefile.yml b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
index 6b729195e57f8267fd0911d8a8b257e40196df2e..dd8f57759d5428130b09be59141c0aaebd4e9ece 100644
--- a/.gitlab/ci/jobs/batocera-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/batocera-arm64-makefile.yml
@@ -1,7 +1,7 @@
 batocera:arm64 Makefile:
   extends: Debian stable:arm64 Makefile
 
-  stage: batocera
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/batocera-arm64.yml b/.gitlab/ci/jobs/batocera-arm64.yml
index 01bebc752987ab1bf5d9b89acc6511bc8b410477..5011c4322fd914adf65e1701b91e5f08194785af 100644
--- a/.gitlab/ci/jobs/batocera-arm64.yml
+++ b/.gitlab/ci/jobs/batocera-arm64.yml
@@ -1,7 +1,7 @@
 batocera:arm64:
   extends: Debian stable:arm64
 
-  stage: batocera
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
index 9f54349e04350f838ff1190b39a16e871e6a765a..f365a79274021e70e3e486b39f617778dd5ddde3 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64-makefile.yml
@@ -1,7 +1,7 @@
 Debian oldstable:amd64 Makefile:
   extends: Debian stable:amd64 Makefile
 
-  stage: oldstable
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-oldstable-amd64.yml b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
index 90f6fd7336afd85daf12d63c4c4facf95b80779b..3989f750b9b5b6bc059c87a309197ebabbb3447d 100644
--- a/.gitlab/ci/jobs/debian-oldstable-amd64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-amd64.yml
@@ -1,7 +1,7 @@
 Debian oldstable:amd64:
   extends: Debian stable:amd64
 
-  stage: oldstable
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
index 4009fee3fb1c72f9ff08d961e50ede3b965907a5..25782baf23ce7d82ae017ccc699e6cd8c67c708c 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64-makefile.yml
@@ -1,7 +1,7 @@
 Debian oldstable:arm64 Makefile:
   extends: Debian stable:arm64 Makefile
 
-  stage: oldstable
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-oldstable-arm64.yml b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
index 75b5631998497184f4d7dd88a085dc8a61c241e8..db0e7f861d3731734936094d8383d578cfd05427 100644
--- a/.gitlab/ci/jobs/debian-oldstable-arm64.yml
+++ b/.gitlab/ci/jobs/debian-oldstable-arm64.yml
@@ -1,7 +1,7 @@
 Debian oldstable:arm64:
   extends: Debian stable:arm64
 
-  stage: oldstable
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml b/.gitlab/ci/jobs/debian-stable-amd64-makefile.yml
index 5d30dfe021c9aa25e54139801e3f801a7b0d38c0..fee52c5a793015212c397c2907f1b927489ea93a 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: stable
+  stage: build
 
   artifacts:
     paths:
diff --git a/.gitlab/ci/jobs/debian-stable-amd64.yml b/.gitlab/ci/jobs/debian-stable-amd64.yml
index 7377cfe1d6f0ceac71cfcb24ec44871c2c32e904..e58f5a112ca5a203d255dc6a9732ed46626d8f15 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: stable
+  stage: build
 
   artifacts:
     paths:
diff --git a/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml b/.gitlab/ci/jobs/debian-stable-arm64-makefile.yml
index b00ebe7e0b7b481b972379ced985272e2b40e268..aa0ea3780bc3aad545ce70b2667374a62b839673 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: stable
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-stable-arm64.yml b/.gitlab/ci/jobs/debian-stable-arm64.yml
index d3446cd775da7c12092d1cd7f901fefbba9372ca..135d87aa5942bf87f0f79cf3e982e9e345debe74 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: stable
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-stable-clang-amd64.yml b/.gitlab/ci/jobs/debian-stable-clang-amd64.yml
index 2a7704ed97658dc29e65c89ebf7c6c53eda6a3cb..870e96bc7a72c88b6fd0058abc33cfc44a6fe9bd 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: clang
+  stage: build
 
   when: on_success
 
diff --git a/.gitlab/ci/jobs/debian-stable-i386-makefile.yml b/.gitlab/ci/jobs/debian-stable-i386-makefile.yml
index acf757556cb1c72ae3789c751a9a7221c5359953..dd572ec383c489d3414a312348806f47c65f3cbc 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: stable
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-stable-i386.yml b/.gitlab/ci/jobs/debian-stable-i386.yml
index ff3dbface60900af2685066bd7cb033a682f571d..970b92a69c6f00ff508a0126bd1b82962f8e5c48 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: stable
+  stage: build
 
   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 e3cc0925689491ca02e29a50374e48223a02949a..1165b1fea3e9ef2eb8db122f51a3dcb14174b15b 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: testing
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml b/.gitlab/ci/jobs/debian-testing-gcc-amd64.yml
index fbad8dfb367fb9f40188a627f0275a8cd0193e36..fc998ea47b78b10476e72d6605c9ecfe6ea54009 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: testing
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml
index 775025467414d826ad1a58f5cc7d523758fda40e..476bb6abadd05ffc5fb95ff9916f020a2aa8566c 100644
--- a/.gitlab/ci/jobs/macos-arm64.yml
+++ b/.gitlab/ci/jobs/macos-arm64.yml
@@ -1,7 +1,7 @@
 osxcross arm64:
   extends: .srb2ci
 
-  stage: osxcross
+  stage: build
 
   artifacts:
     paths:
diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml
index 5f59f5cd71365217e6a694f94b07af1eb99df25c..cc9749e9aebc60ef0848eb04ad532525d4a9fcde 100644
--- a/.gitlab/ci/jobs/macos-x86_64.yml
+++ b/.gitlab/ci/jobs/macos-x86_64.yml
@@ -1,7 +1,7 @@
 osxcross x86_64:
   extends: .srb2ci
 
-  stage: osxcross
+  stage: build
 
   artifacts:
     paths:
diff --git a/.gitlab/ci/jobs/windows-x64-makefile.yml b/.gitlab/ci/jobs/windows-x64-makefile.yml
index 8fdc5307398b34bbe05e8b1d35fdd519892baedf..8da30d2b9822fd42c90f00df2d061284d1c753ef 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: win32
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/windows-x64.yml b/.gitlab/ci/jobs/windows-x64.yml
index 70af9401b032b732bbcbf610128db5f301f7f9d8..abb5ec3e3e022a06452deff50f3f3821db39667e 100644
--- a/.gitlab/ci/jobs/windows-x64.yml
+++ b/.gitlab/ci/jobs/windows-x64.yml
@@ -1,7 +1,7 @@
 Windows x64:
   extends: .srb2ci
 
-  stage: win32
+  stage: build
 
   when: manual
 
diff --git a/.gitlab/ci/jobs/windows-x86-makefile.yml b/.gitlab/ci/jobs/windows-x86-makefile.yml
index d81baf2f12dffb66003700dbb585802d2f79c0a7..213342cda81e119827937a79df8b1f74242d7ef2 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: win32
+  stage: build
 
   when: on_success
 
diff --git a/.gitlab/ci/jobs/windows-x86.yml b/.gitlab/ci/jobs/windows-x86.yml
index a7d0136499ef5aedb6580c19021019cc5f37e9a3..195c1aab15865b875084b8612ec83c805587e587 100644
--- a/.gitlab/ci/jobs/windows-x86.yml
+++ b/.gitlab/ci/jobs/windows-x86.yml
@@ -1,7 +1,7 @@
 Windows x86:
   extends: .srb2ci
 
-  stage: win32
+  stage: build
 
   cache:
     - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG