diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 1ea5cd7d41..427e2ed446 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -1179,7 +1179,7 @@ jobs:
     environment: release
     permissions:
       contents: read
-    if: ${{ github.event_name != 'pull_request' && needs.publish-wheel.result == 'success' }}
+    if: ${{ github.event_name == 'push' && needs.publish-wheel.result == 'success' }}
 
     steps:
     - name: Submit wheel release to Kitmaker
@@ -1193,9 +1193,9 @@ jobs:
         ARTIFACTORY_URL: ${{ secrets.ARTIFACTORY_URL }}
         ARTIFACTORY_REPO: ${{ secrets.ARTIFACTORY_REPO }}
         WHEEL_PATHS: ${{ needs.publish-wheel.outputs.wheel_paths }}
-        KITMAKER_UPLOAD: ${{ startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/tags/v') }}
-        # Only a vX.Y.Z tag is a final version and mirrors to PyPI.
-        # release/*.*.x builds are rc versions and stay on DevZone.
+        KITMAKER_UPLOAD: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/tags/v') }}
+        # Only a vX.Y.Z tag is a final version and mirrors to PyPI.org.
+        # Pre-releases: a1 (main branch) and rc1 (release/*.*.x branch) versions stay on DevZone.
         KITMAKER_MIRRORING: ${{ startsWith(github.ref, 'refs/tags/v') && 'upload-both' || 'claim-project' }}
       run: |
         set -euo pipefail
@@ -1289,7 +1289,7 @@ jobs:
       - kitmaker
     permissions:
       contents: read
-    if: ${{ github.event_name != 'pull_request' && needs.kitmaker.result == 'success' }}
+    if: ${{ needs.kitmaker.result == 'success' }}
 
     steps:
     - name: Monitor Kitmaker release status