diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
index 17a8dfb..f1b08a6 100644
--- a/.github/workflows/build-latest.yaml
+++ b/.github/workflows/build-latest.yaml
@@ -82,7 +82,7 @@ jobs:
           bash ./test.sh
 
   push-internal-pr-images:
-    if: github.event_name == 'pull_request' && github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url
+    if: github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url
     runs-on: ubuntu-latest
     needs: [ run-scenario-tests ]
     strategy:
@@ -114,7 +114,7 @@ jobs:
         with:
           images: ${{ secrets.DOCKERHUB_REPO}}/postgis
           tags: |
-            type=semver,pattern=\d-\d.\d
+            type=semver,pattern={{version}}
             type=ref,event=branch
             type=ref,event=pr