diff --git a/.github/workflows/close_pr.yml b/.github/workflows/close_pr.yml
index ba2e95beeb..ee22ec0021 100644
--- a/.github/workflows/close_pr.yml
+++ b/.github/workflows/close_pr.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   auto-close:
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'zitadel'
+    if: github.repository_id == 'zitadel'
     steps:
       - name: Comment and close PR
         uses: actions/github-script@v7
diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
index 400cfec07e..c3a93e341b 100644
--- a/.github/workflows/issues.yml
+++ b/.github/workflows/issues.yml
@@ -9,7 +9,7 @@ jobs:
   add-to-project:
     name: Add issue and community pr to project
     runs-on: ubuntu-latest
-    if: github.repository_owner == 'zitadel'
+    if: github.repository_id == 'zitadel'
     steps:
       - name: add issue
         uses: actions/add-to-project@v1.0.2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 95830cdb4e..24802d51cd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
 jobs:
   release:
     runs-on: ubuntu-latest
-    if: github.repository_owner != 'zitadel'
+    if: github.repository_id != 'zitadel'
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 105201e33e..edf6cc391c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,8 +15,7 @@ jobs:
   quality:
     name: Ensure Quality
     if: github.event_name == 'workflow_dispatch' ||
-      (github.event_name == 'push' && github.repository_owner != 'zitadel') ||
-      (github.event_name == 'pull_request' && github.repository_owner != 'zitadel')
+      (github.event_name == 'pull_request' && github.repository_id != 'zitadel')
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     permissions:
@@ -26,6 +25,7 @@ jobs:
       CACHE_DIR: /tmp/login-run-caches
     # Only run this job on workflow_dispatch or pushes to forks
     steps:
+      - run: echo "${{ github.repository_id }}"
       - uses: actions/checkout@v4
       - name: Docker meta
         id: meta