diff --git a/.github/workflows/main_staging.yml b/.github/workflows/main_staging.yml
index 10b8eb4..2f6987c 100644
--- a/.github/workflows/main_staging.yml
+++ b/.github/workflows/main_staging.yml
@@ -37,8 +37,18 @@ jobs:
       KOSLI_HOST: ${{ needs.variables.outputs.kosli_host }}
       KOSLI_ORG: ${{ needs.variables.outputs.kosli_org }}
 
+  wait-for-image:
+    needs: [create-kosli-flow]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Wait for image to be built in main.yml
+        run:
+          ./sh/wait_for_image.sh
+
   test:
-    needs: [variables, create-kosli-flow]
+    needs: [variables, wait-for-image]
     uses: ./.github/workflows/sub_test.yml
     secrets:
       KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN }}
diff --git a/.github/workflows/main_staging_trails.yml b/.github/workflows/main_staging_trails.yml
index 78173f9..e41a11c 100644
--- a/.github/workflows/main_staging_trails.yml
+++ b/.github/workflows/main_staging_trails.yml
@@ -37,8 +37,18 @@ jobs:
       KOSLI_HOST: ${{ needs.variables.outputs.kosli_host }}
       KOSLI_ORG: ${{ needs.variables.outputs.kosli_org }}
 
+  wait-for-image:
+    needs: [create-kosli-flow]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Wait for image to be built in main.yml
+        run:
+          ./sh/wait_for_image.sh
+
   test:
-    needs: [variables, create-kosli-flow]
+    needs: [variables, wait-for-image]
     uses: ./.github/workflows/sub_test_trails.yml
     secrets:
       KOSLI_API_TOKEN: ${{ secrets.KOSLI_API_TOKEN_TRAILS }}