diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 9b782d8fb7..c10450f8a6 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -108,7 +108,6 @@ jobs:
               run: make test
 
     build-amazonlinux-latest:
-        if: github.repository_owner == 'valkey-io'
         strategy:
             # Run all jobs
             fail-fast: false
diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
index c19dead61f..ac8e771025 100644
--- a/.github/workflows/java-cd.yml
+++ b/.github/workflows/java-cd.yml
@@ -25,7 +25,7 @@ permissions:
 
 jobs:
     start-self-hosted-runner:
-        if: github.repository_owner == 'valkey-io'
+        if: github.event.pull_request.head.repo.owner.login == 'valkey-io'
         runs-on: ubuntu-latest
         environment: AWS_ACTIONS
         steps:
@@ -43,7 +43,7 @@ jobs:
 
     create-binaries-to-publish:
         needs: start-self-hosted-runner
-        if: github.repository_owner == 'valkey-io'
+        if: github.event.pull_request.head.repo.owner.login == 'valkey-io'
         timeout-minutes: 35
         env:
             JAVA_VERSION: '11'
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index dd8a7fc4af..2d35608975 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -119,7 +119,6 @@ jobs:
                       java/client/build/reports/spotbugs/**
 
     build-amazonlinux-latest:
-        if: github.repository_owner == 'valkey-io'
         strategy:
             # Run all jobs
             fail-fast: false
diff --git a/.github/workflows/npm-cd.yml b/.github/workflows/npm-cd.yml
index 4031ada90f..280552fd83 100644
--- a/.github/workflows/npm-cd.yml
+++ b/.github/workflows/npm-cd.yml
@@ -30,13 +30,10 @@ permissions:
 
 jobs:
     start-self-hosted-runner:
-        if: github.repository_owner == 'valkey-io'
+        if: github.event.pull_request.head.repo.owner.login == 'valkey-io'
         runs-on: ubuntu-latest
         environment: AWS_ACTIONS
         steps:
-          - run: echo $OWNER
-            env:
-              OWNER: ${{ github.repository_owner }}
           - name: Checkout
             uses: actions/checkout@v4
             with:
@@ -67,7 +64,7 @@ jobs:
 
     publish-binaries:
         needs: [start-self-hosted-runner, load-platform-matrix]
-        if: github.repository_owner == 'valkey-io'
+        if: github.event.pull_request.head.repo.owner.login == 'valkey-io'
         name: Publish packages to NPM
         runs-on: ${{ matrix.build.RUNNER }}
         container:
diff --git a/.github/workflows/pypi-cd.yml b/.github/workflows/pypi-cd.yml
index bcbcbf108f..488db71948 100644
--- a/.github/workflows/pypi-cd.yml
+++ b/.github/workflows/pypi-cd.yml
@@ -46,7 +46,7 @@ jobs:
                 
 
     start-self-hosted-runner:
-        if: github.repository_owner == 'valkey-io'
+        if: github.event.pull_request.head.repo.owner.login == 'valkey-io'
         runs-on: ubuntu-latest
         environment: AWS_ACTIONS
         steps:
@@ -61,7 +61,7 @@ jobs:
 
     publish-binaries:
         needs: [start-self-hosted-runner, load-platform-matrix]
-        if: github.repository_owner == 'valkey-io'
+        if: github.event.pull_request.head.repo.owner.login == 'valkey-io'
         name: Publish packages to PyPi
         runs-on: ${{ matrix.build.RUNNER }}
         timeout-minutes: 25