diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e86ec08c..3a6830f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,6 +100,7 @@ workflow:
 
 nvidia-smi:
   stage: config
+  needs: []
   image: nvidia/cuda:${CUDA_VERSION}-base-${CUDA_OS}
   tags:
     - gpu
@@ -116,6 +117,7 @@ nvidia-smi:
 ## - export tag to public registries, optional secondary export tag
 version:
   stage: config
+  needs: []
   script:
     - |
       if [ -n "${VERSION}" ]; then
@@ -188,6 +190,7 @@ version:
 
 status:pending:
   stage: status-pending
+  needs: []
   extends: .status
   variables:
     STATE: "pending"
@@ -747,6 +750,7 @@ df:
 .prune:
   extends: .build
   stage: config
+  needs: []
   rules:
     - when: manual
   script:
@@ -771,6 +775,7 @@ prune:docker-new:
 clean_internal_tag:
   image: alpine/curl
   stage: finalize
+  needs: []
   rules:
     - when: manual
   script:
@@ -785,6 +790,16 @@ clean_internal_tag:
 .clean_unstable_mr:
   extends: .docker
   stage: finalize
+  needs:
+    - { job: user_spack_environment, optional: true }
+    - { job: "cuda:torch", optional: true }
+    - { job: "eic_xl:singularity:default", optional: true }
+    - { job: "eic_xl:singularity:nightly", optional: true }
+    - { job: "benchmarks:geoviewer:default", optional: true }
+    - { job: "benchmarks:detector:default", optional: true }
+    - { job: "benchmarks:detector:nightly", optional: true }
+    - { job: "benchmarks:phyiscs:default", optional: true }
+    - { job: "benchmarks:physics:nightly", optional: true }
   when: always
   script:
     - apk add curl jq
@@ -828,6 +843,15 @@ clean_unstable_mr:docker-new:
   needs:
     - version
     - clean_internal_tag
+    - { job: user_spack_environment, optional: true }
+    - { job: "cuda:torch", optional: true }
+    - { job: "eic_xl:singularity:default", optional: true }
+    - { job: "eic_xl:singularity:nightly", optional: true }
+    - { job: "benchmarks:geoviewer:default", optional: true }
+    - { job: "benchmarks:detector:default", optional: true }
+    - { job: "benchmarks:detector:nightly", optional: true }
+    - { job: "benchmarks:phyiscs:default", optional: true }
+    - { job: "benchmarks:physics:nightly", optional: true }
   when: always
   script:
     - apk add curl jq
@@ -881,6 +905,7 @@ clean_pipeline:docker-new:
 spack-cache-cleanup:
   extends: .build
   stage: finalize
+  needs: [version]
   when: always
   allow_failure: true
   script:
@@ -892,7 +917,22 @@ spack-cache-cleanup:
 
 status:success:
   stage: status-report
-  dependencies: []
+  needs:
+    - { job: nvidia-smi, optional: true }
+    - { job: user_spack_environment, optional: true }
+    - { job: "cuda:torch", optional: true }
+    - { job: "eic_xl:singularity:default", optional: true }
+    - { job: "eic_xl:singularity:nightly", optional: true }
+    - { job: "benchmarks:geoviewer:default", optional: true }
+    - { job: "benchmarks:detector:default", optional: true }
+    - { job: "benchmarks:detector:nightly", optional: true }
+    - { job: "benchmarks:phyiscs:default", optional: true }
+    - { job: "benchmarks:physics:nightly", optional: true }
+    - { job: "clean_pipeline:gpu", optional: true }
+    - { job: "clean_pipeline:docker-new", optional: true }
+    - { job: "clean_unstable_mr:gpu", optional: true }
+    - { job: "clean_unstable_mr:docker-new", optional: true }
+    - { job: spack-cache-cleanup, optional: true }
   extends: .status
   variables:
     STATE: "success"
@@ -901,7 +941,7 @@ status:success:
 
 status:failure:
   stage: status-report
-  dependencies: []
+  needs: []
   extends: .status
   variables:
     STATE: "failure"