diff --git a/.github/workflows/_buildx.yml b/.github/workflows/_buildx.yml
index 467aeb72a..addbcb0c3 100644
--- a/.github/workflows/_buildx.yml
+++ b/.github/workflows/_buildx.yml
@@ -26,10 +26,9 @@ jobs:
       - name: Prepare master push tags
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         run: |
-          echo "tag_flags=--tag ${{ github.ref }}" >> $GITHUB_ENV
           REPO=ghcr.io/${{ github.repository }}
           TAG=$(git describe --tags)
-          if [ -z "$(git tag --points-at HEAD)" ]
+          if [ -z "$(git tag --points-at HEAD)" ] || [ "$TAG" == *"rc"* ]
           then
             TAG2="dev"
           else
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 5818fa905..b4b0c6ec3 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -19,4 +19,6 @@ jobs:
     uses: ./.github/workflows/_gorelease.yml
   call-buildx:
     needs: call-gorelease
+    # only build on pull requests from the same repo for now
+    if: github.event.pull_request.head.repo.full_name == github.repository
     uses: ./.github/workflows/_buildx.yml