diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f40e3aca127ccb383f890a4fb92e9f92661ae69..bd5b9b02a0acbfbdb7cfa4c98e376e54615e6cf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,6 +47,9 @@ variables:
     - master
     - tags
 
+###################################
+# Debian
+###################################
 build/debian/bullseye:
   <<: *build
   variables:
@@ -57,12 +60,12 @@ test/debian/bullseye:
   variables:
     DOCKER_IMAGE: debian/bullseye
   dependencies:
-    - build/debian/bullseye
+  - build/debian/bullseye
 
 upload/debian/bullseye:
   <<: *upload
   dependencies:
-    - build/debian/bullseye
+  - build/debian/bullseye
 
 build/debian/buster:
   <<: *build
@@ -74,47 +77,53 @@ test/debian/buster:
   variables:
     DOCKER_IMAGE: debian/buster
   dependencies:
-    - build/debian/buster
+  - build/debian/buster
 
 upload/debian/buster:
   <<: *upload
   dependencies:
-    - build/debian/buster
+  - build/debian/buster
 
-build/ubuntu/jammy:
+###################################
+# Ubuntu
+###################################
+build/ubuntu/focal:
   <<: *build
   variables:
-    DOCKER_IMAGE: ubuntu/jammy
+    DOCKER_IMAGE: ubuntu/focal
 
-test/ubuntu/jammy:
+test/ubuntu/focal:
   <<: *test
   variables:
-    DOCKER_IMAGE: ubuntu/jammy
+    DOCKER_IMAGE: ubuntu/focal
   dependencies:
-    - build/ubuntu/jammy
+  - build/ubuntu/focal
 
-upload/ubuntu/jammy:
+upload/ubuntu/focal:
   <<: *upload
   dependencies:
-    - build/ubuntu/jammy
+  - build/ubuntu/focal
 
-build/ubuntu/focal:
+build/ubuntu/jammy:
   <<: *build
   variables:
-    DOCKER_IMAGE: ubuntu/focal
+    DOCKER_IMAGE: ubuntu/jammy
 
-test/ubuntu/focal:
+test/ubuntu/jammy:
   <<: *test
   variables:
-    DOCKER_IMAGE: ubuntu/focal
+    DOCKER_IMAGE: ubuntu/jammy
   dependencies:
-    - build/ubuntu/focal
+  - build/ubuntu/jammy
 
-upload/ubuntu/focal:
+upload/ubuntu/jammy:
   <<: *upload
   dependencies:
-    - build/ubuntu/focal
+  - build/ubuntu/jammy
 
+###################################
+# Raspbian
+###################################
 build/raspbian/bullseye:
   <<: *build
   variables: