diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index c35c020763253..3ea5793dc7ce9 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -95,7 +95,7 @@ jobs:
           distribution: 'temurin'
       - name: Setup Bazel with caching
         if: inputs.caching
-        uses: p0deje/setup-bazel@0.6.0
+        uses: bazel-contrib/setup-bazel@0.8.0
         with:
           bazelisk-cache: true
           bazelrc: common --color=yes
@@ -110,7 +110,7 @@ jobs:
           repository-cache: true
       - name: Setup Bazel without caching
         if: inputs.caching == false
-        uses: p0deje/setup-bazel@0.6.0
+        uses: bazel-contrib/setup-bazel@0.8.0
         with:
           bazelrc: common --color=yes
       - name: Setup Fluxbox and Xvfb
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9348638705747..29553d8d7899a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           fetch-depth: 50
       - name: Setup Bazel
-        uses: p0deje/setup-bazel@0.4.0
+        uses: bazel-contrib/setup-bazel@0.8.0
         with:
           bazelisk-cache: true
           external-cache: |