diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5dc133d9..48840e31 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,30 +82,6 @@ jobs:
       env:
         DOCKER_DEFAULT_PLATFORM: ${{ matrix.platform }}
 
-  # Run pathogen repo CI builds with the final image
-  test-pathogen-repo-ci:
-    needs: build
-    strategy:
-      # XXX TODO: Test on multiple platforms via the matrix too, as above?
-      matrix:
-        include:
-          - { pathogen: avian-flu,       build-args: auspice/flu_avian_h5n1_ha.json }
-          - { pathogen: ebola }
-          - { pathogen: lassa }
-          - { pathogen: monkeypox }
-          - { pathogen: mumps }
-          - { pathogen: ncov,            build-args: all_regions -j 2 --profile nextstrain_profiles/nextstrain-ci }
-          - { pathogen: seasonal-flu,    build-args: --configfile profiles/ci/builds.yaml -p }
-          - { pathogen: zika }
-    name: test-pathogen-repo-ci (${{ matrix.pathogen }})
-    uses: nextstrain/.github/.github/workflows/pathogen-repo-ci.yaml@master
-    with:
-      repo: nextstrain/${{ matrix.pathogen }}
-      build-args: ${{ matrix.build-args }}
-      env: |
-        NEXTSTRAIN_DOCKER_IMAGE: ghcr.io/nextstrain/base:${{ needs.build.outputs.tag }}
-      continue-on-error: true
-
   validate-platforms:
     name: Validate platforms
     needs: build
@@ -173,6 +149,37 @@ jobs:
       run: |
         ./devel/copy-images -i ghcr.io -o docker.io -t ${{ needs.build.outputs.tag }} -l
 
+  # Run pathogen repo CI builds with the final image
+  test-pathogen-repo-ci:
+    # Only one of push-{branch,build} runs for any given workflow run, and
+    # we're ok with either of them.
+    needs: [build, push-branch, push-build]
+    if: |2
+         success()
+      || needs.push-branch.result == 'success'
+      || needs.push-build.result == 'success'
+    strategy:
+      # XXX TODO: Test on multiple platforms via the matrix too, as above?
+      matrix:
+        include:
+          - { pathogen: avian-flu,       build-args: auspice/flu_avian_h5n1_ha.json }
+          - { pathogen: ebola }
+          - { pathogen: lassa }
+          - { pathogen: monkeypox }
+          - { pathogen: mumps }
+          - { pathogen: ncov,            build-args: all_regions -j 2 --profile nextstrain_profiles/nextstrain-ci }
+          - { pathogen: seasonal-flu,    build-args: --configfile profiles/ci/builds.yaml -p }
+          - { pathogen: zika }
+    name: test-pathogen-repo-ci (${{ matrix.pathogen }})
+    uses: nextstrain/.github/.github/workflows/pathogen-repo-ci.yaml@master
+    with:
+      repo: nextstrain/${{ matrix.pathogen }}
+      build-args: ${{ matrix.build-args }}
+      env: |
+        NEXTSTRAIN_DOCKER_IMAGE: nextstrain/base:${{ needs.build.outputs.tag }}
+      continue-on-error: true
+    secrets: inherit
+
   # Delete the builder and final images from GitHub Container Registry.
   cleanup-registry:
     if: always()