diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d3dcd885e6e9ee5d29248ee3d38d3cdbbf2cfd0..6d9a1dda16423e0def6d03a9a1c0dffa6bcbd710 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -266,7 +266,8 @@ mac-gm-fsl:
 mac-gm-all:
   <<: *macos-job
   <<: *geomodel-job
-  stage: step-A
+  stage: step-C
+  needs: ["mac-coin", "mac-soqt"]
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
     CMAKE_EXTRA_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE
@@ -380,8 +381,8 @@ ubu-gm-fsl:
 ubu-gm-all:
   <<: *ubuntu-job
   <<: *geomodel-job
-  stage: step-B
-  needs: ["ubu-geant4"]
+  stage: step-C
+  needs: ["ubu-coin", "ubu-soqt", "ubu-geant4"]
   variables:
     CMAKE_ARGS: ${CMAKE_BASE_ARGS}
     CMAKE_CONFIG_FLAGS: -DGEOMODEL_BUILD_ALL=TRUE