diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 81de347..01c9c72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -211,32 +211,31 @@ jobs:
         shell: bash
         run: bazel build --config=buildbuddy-remote-exec-ci --remote_header=x-buildbuddy-api-key=${BUILDBUDDY_API_KEY?} //examples/basic_app/java/com/example/hermetic:app
 
-  # TODO: Re-enable once https://github.com/bazelbuild/rules_android_ndk/issues/148 is fixed
-  # bazel_rolling:
-  #   name: Bazel rolling (${{ matrix.os }})
-  #   runs-on: ${{ matrix.os }}
-  #   env:
-  #     USE_BAZEL_VERSION: rolling
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       os:
-  #         - ubuntu-latest
-  #         - macos-latest
-  #         - windows-latest
-
-  #   steps:
-  #     - uses: actions/checkout@v7
-
-  #     - uses: bazel-contrib/setup-bazel@0.19.0
-  #       with:
-  #         bazelisk-cache: true
-  #         disk-cache: true
-  #         repository-cache: true
-
-  #     - name: Test
-  #       shell: bash
-  #       run: bazel test --config=buildbuddy-ci ${BUILDBUDDY_API_KEY:+--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY} //...
+  bazel_rolling:
+    name: Bazel rolling (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    env:
+      USE_BAZEL_VERSION: rolling
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+
+    steps:
+      - uses: actions/checkout@v7
+
+      - uses: bazel-contrib/setup-bazel@0.19.0
+        with:
+          bazelisk-cache: true
+          disk-cache: true
+          repository-cache: true
+
+      - name: Test
+        shell: bash
+        run: bazel test --config=buildbuddy-ci ${BUILDBUDDY_API_KEY:+--remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY} //...
 
   ci:
     name: CI
@@ -250,7 +249,7 @@ jobs:
       - emulator_instrumentation
       - bazel_latest
       - bazel_cross_compilation
-      # - bazel_rolling
+      - bazel_rolling
     if: ${{ always() }}
 
     steps:
@@ -265,7 +264,7 @@ jobs:
           EMULATOR_INSTRUMENTATION_RESULT: ${{ needs.emulator_instrumentation.result }}
           BAZEL_LATEST_RESULT: ${{ needs.bazel_latest.result }}
           BAZEL_LATEST_REMOTE_EXEC_RESULT: ${{ needs.bazel_cross_compilation.result }}
-          BAZEL_ROLLING_RESULT: success
+          BAZEL_ROLLING_RESULT: ${{ needs.bazel_rolling.result }}
         run: |
           echo "pre-commit: ${PRE_COMMIT_RESULT}"
           echo "Bazel 8.4.2: ${BAZEL_LOWEST_SUPPORTED_RESULT}"