diff --git a/.github/workflows/rpm-build.yml b/.github/workflows/rpm-build.yml
index d23d085..3bc2af6 100644
--- a/.github/workflows/rpm-build.yml
+++ b/.github/workflows/rpm-build.yml
@@ -158,7 +158,10 @@ jobs:
     if: |
         (needs.Import-commit-pragmas.outputs.run-gha == 'true' ||
          inputs.RUN_GHA == 'true' ||
-         github.event_name == 'workflow_dispatch')
+         github.event_name == 'workflow_dispatch') &&
+        needs.Import-commit-pragmas.outputs.rpm-test-version == '' &&
+        (!contains(needs.Import-commit-pragmas.outputs.pr-repos,
+         '${{ inputs.NAME }}@'))
     env:
       # TODO -- this should be on stable, backedup storage, not /scratch
       # yamllint disable-line rule:line-length