diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61419cc6a76c28b1d4acc4c75742d9c99faf8da4..a3785c97824255f90ebfce01e81d1cfe47b229b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,7 @@ test/debian/bullseye:x86_64:
   variables:
     DOCKER_IMAGE: debian/bullseye
   dependencies:
-    - debian/bullseye
+    - debian/bullseye:x86_64
 
 debian/bullseye:x86:
   <<: *binary
@@ -99,7 +99,6 @@ test/debian/bullseye:x86:
     DOCKER_IMAGE: debian/bullseye:x86
   dependencies:
     - debian/bullseye:x86
-    - debian/bullseye:x86_64
 
 upload/debian/bullseye:
   <<: *upload
@@ -126,7 +125,7 @@ test/debian/buster:x86_64:
   variables:
     DOCKER_IMAGE: debian/buster
   dependencies:
-    - debian/buster
+    - debian/buster:x86_64
 
 debian/buster:x86:
   <<: *binary
@@ -141,7 +140,6 @@ test/debian/buster:x86:
     DOCKER_IMAGE: debian/buster:x86
   dependencies:
     - debian/buster:x86
-    - debian/buster:x86_64
 
 upload/debian/buster:
   <<: *upload
@@ -168,7 +166,7 @@ test/debian/stretch:x86_64:
   variables:
     DOCKER_IMAGE: debian/stretch
   dependencies:
-    - debian/stretch
+    - debian/stretch:x86_64
 
 debian/stretch:x86:
   <<: *binary
@@ -183,7 +181,6 @@ test/debian/stretch:x86:
     DOCKER_IMAGE: debian/stretch:x86
   dependencies:
     - debian/stretch:x86
-    - debian/stretch:x86_64
 
 upload/debian/stretch:
   <<: *upload
@@ -214,7 +211,7 @@ test/ubuntu/hirsute:x86_64:
   variables:
     DOCKER_IMAGE: ubuntu/hirsute
   dependencies:
-    - ubuntu/hirsute
+    - ubuntu/hirsute:x86_64
 
 upload/ubuntu/hirsute:
   <<: *upload
@@ -239,7 +236,7 @@ test/ubuntu/focal:x86_64:
   variables:
     DOCKER_IMAGE: ubuntu/focal
   dependencies:
-    - ubuntu/focal
+    - ubuntu/focal:x86_64
 
 upload/ubuntu/focal:
   <<: *upload
@@ -265,7 +262,7 @@ test/ubuntu/bionic:x86_64:
   variables:
     DOCKER_IMAGE: ubuntu/bionic
   dependencies:
-    - ubuntu/bionic
+    - ubuntu/bionic:x86_64
 
 ubuntu/bionic:x86:
   <<: *binary
@@ -280,7 +277,6 @@ test/ubuntu/bionic:x86:
     DOCKER_IMAGE: ubuntu/bionic:x86
   dependencies:
     - ubuntu/bionic:x86
-    - ubuntu/bionic:x86_64
 
 upload/ubuntu/bionic:
   <<: *upload