diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 8ee42e74..ba502a74 100644
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -112,7 +112,6 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v7,linux/arm64
-          # Skip pushing when PR from a fork
           push: false
           outputs: type=oci,dest=./image.tar
           cache-from: type=registry,ref=ghcr.io/${{ steps.lower-owner.outputs.owner }}/opensprinkler-build-cache:ospi
@@ -144,7 +143,7 @@ jobs:
     name: Release Docker
     runs-on: ubuntu-latest
     needs: [build-pio, build-docker]
-    if: ${{ !github.event.pull_request.head.repo.fork }}
+    if: ${{ !github.event.pull_request }}
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -165,8 +164,6 @@ jobs:
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
-        # Skip when PR from a fork
-        if: ${{ !github.event.pull_request.head.repo.fork }}
         with:
           registry: ghcr.io
           username: ${{ env.ACT && github.actor || steps.lower-owner.outputs.owner }}