diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
index 3f4a9f0c957a6..ba224bbb62dbc 100644
--- a/.github/workflows/bazel.yml
+++ b/.github/workflows/bazel.yml
@@ -122,21 +122,21 @@ jobs:
           node-version: ${{ inputs.node-version }}
       - name: Setup Bazel with caching
         if: inputs.caching
-        uses: bazel-contrib/setup-bazel@0.13.0
+        uses: calebzulawski/setup-bazel@feature/disk-cache
         with:
           bazelisk-cache: true
           bazelrc: common --color=yes
-          cache-version: 2
-          disk-cache: ${{ inputs.cache-key }}
+          cache-prefix: 3-${{ github.job }}-${{ inputs.os }}-${{ inputs.cache-key }}
           external-cache: |
             name: ${{ inputs.cache-key }}
             manifest:
               crates: rust/Cargo.Bazel.lock
               rules_ruby++ruby+ruby: ${{ inputs.os == 'windows' && 'false' || 'rb/.ruby-version' }}
+          disk-cache: true
           repository-cache: true
       - name: Setup Bazel without caching
         if: inputs.caching == false
-        uses: bazel-contrib/setup-bazel@0.13.0
+        uses: calebzulawski/setup-bazel@feature/disk-cache
         with:
           bazelrc: common --color=yes
       - name: Setup Fluxbox and Xvfb
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00f86c98c0148..98c405ca307e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,15 +25,16 @@ jobs:
         with:
           fetch-depth: 50
       - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.13.0
+        uses: calebzulawski/setup-bazel@feature/disk-cache
         with:
           bazelisk-cache: true
-          cache-version: 2
+          bazelrc: common --color=yes
+          cache-prefix: 3-${{ github.job }}
           external-cache: |
-            name: ci-check
+            name: check
             manifest:
               crates: rust/Cargo.Bazel.lock
-              rules_ruby~~ruby~ruby: rb/.ruby-version
+              rules_ruby++ruby+ruby: ${{ runner.os == 'windows' && 'false' || 'rb/.ruby-version' }}
           repository-cache: true
       - name: Check Bazel targets
         id: check-targets
diff --git a/rb/.ruby-version b/rb/.ruby-version
index 9cec7165ab0a0..dcb564fdb327e 100644
--- a/rb/.ruby-version
+++ b/rb/.ruby-version
@@ -1 +1 @@
-3.1.6
+jruby-9.4.12.0