diff --git a/.github/actions/download-docker-artifact/action.yml b/.github/actions/download-docker-artifact/action.yml
index b1ffcb1..60f9fd3 100644
--- a/.github/actions/download-docker-artifact/action.yml
+++ b/.github/actions/download-docker-artifact/action.yml
@@ -13,6 +13,14 @@ inputs:
 runs:
   using: "composite"
   steps:
+  - name: Wait for docker image artifact
+    shell: bash
+    run: |
+      export GITHUB_SHA=${{ github.sha }}
+      export REPO_PATH=${{ github.repository }}
+      export GH_TOKEN=${{ inputs.repo-read-token }}
+      pip install -r requirements_test.txt
+      python .github/wait_for_workflow_artifacts.py - ${{ inputs.build-type }}-build-${{ github.sha }}
   - name: Retrieve Docker image
     uses: actions/download-artifact@v4
     with:
diff --git a/.github/workflows/docker-hub-push.yml b/.github/workflows/docker-hub-push.yml
index 1f02277..d24799a 100644
--- a/.github/workflows/docker-hub-push.yml
+++ b/.github/workflows/docker-hub-push.yml
@@ -21,14 +21,7 @@ jobs:
         export GH_TOKEN=${{ secrets.GH_PAT }}
         pip install -r requirements_test.txt
         python .github/wait_for_workflow_artifacts.py google-cloud-deploy docker-hub-push tag-check
-    - name: Wait for docker image artifact
-      run: |
-        export GITHUB_SHA=${{ github.sha }}
-        export REPO_PATH=${{ github.repository }}
-        export GH_TOKEN=${{ secrets.GH_PAT }}
-        pip install -r requirements_test.txt
-        python .github/wait_for_workflow_artifacts.py - release-build-${{ github.sha }}
-    - name: Download docker image artifact
+    - name: Wait for and download docker image artifact
       uses: ./.github/actions/download-docker-artifact
       with:
         repo-read-token: ${{ secrets.GH_PAT }}
diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
index fced1f6..795dc42 100644
--- a/.github/workflows/release-test.yml
+++ b/.github/workflows/release-test.yml
@@ -13,14 +13,7 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Wait for docker image artifact
-      run: |
-        export GITHUB_SHA=${{ github.sha }}
-        export REPO_PATH=${{ github.repository }}
-        export GH_TOKEN=${{ secrets.GH_PAT }}
-        pip install -r requirements_test.txt
-        python .github/wait_for_workflow_artifacts.py - release-build-${{ github.sha }}
-    - name: Download docker image artifact
+    - name: Wait for and download docker image artifact
       uses: ./.github/actions/download-docker-artifact
       with:
         repo-read-token: ${{ secrets.GH_PAT }}
diff --git a/.github/workflows/tag-check.yml b/.github/workflows/tag-check.yml
index 02a0508..be87882 100644
--- a/.github/workflows/tag-check.yml
+++ b/.github/workflows/tag-check.yml
@@ -15,14 +15,7 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Wait for docker image artifact
-      run: |
-        export GITHUB_SHA=${{ github.sha }}
-        export REPO_PATH=${{ github.repository }}
-        export GH_TOKEN=${{ secrets.GH_PAT }}
-        pip install -r requirements_test.txt
-        python .github/wait_for_workflow_artifacts.py - release-build-${{ github.sha }}
-    - name: Download docker image artifact
+    - name: Wait for and download docker image artifact
       uses: ./.github/actions/download-docker-artifact
       with:
           repo-read-token: ${{ secrets.GH_PAT }}