diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9021272..a240ad7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
   publish-nightly:
     needs: build
     permissions: write-all
-    if: (github.ref == 'refs/heads/master') && (!startsWith(github.ref, 'refs/tags/v'))
+    if: (github.event_name == 'push') && (github.ref == 'refs/heads/master')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v2
@@ -67,6 +67,7 @@ jobs:
         with:
           name: nightly
           tag: nightly
+          commit: ${GITHUB_SHA}
           allowUpdates: true
           removeArtifacts: true
           replacesArtifacts: true
@@ -78,7 +79,7 @@ jobs:
   publish-release:
     needs: build
     permissions: write-all
-    if: startsWith(github.ref, 'refs/tags/v')
+    if: (github.event_name == 'push') && startsWith(github.ref, 'refs/tags/v')
     runs-on: ubuntu-latest
     steps:
     - uses: actions/download-artifact@v2