diff --git a/.github/workflows/ci-rbe.yml b/.github/workflows/ci-rbe.yml
index a79d855d2af4c..c01fe0e39259f 100644
--- a/.github/workflows/ci-rbe.yml
+++ b/.github/workflows/ci-rbe.yml
@@ -33,7 +33,6 @@ jobs:
     uses: ./.github/workflows/bazel.yml
     with:
       name: All RBE tests
-      cache-save: ${{ github.ref_name == 'trunk' }}
       rerun-with-debug: true
       ruby-version: jruby-10.1.0.0
       run: ./scripts/github-actions/ci-build.sh ${{ github.event_name == 'schedule' || github.event.inputs.disable_test_cache }}
diff --git a/.github/workflows/gh-cache.yml b/.github/workflows/gh-cache.yml
index 62f0f848e7a9f..0a487416b2003 100644
--- a/.github/workflows/gh-cache.yml
+++ b/.github/workflows/gh-cache.yml
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos, windows]
+        os: [ubuntu, macos, windows]
     uses: ./.github/workflows/bazel.yml
     with:
       name: ${{ matrix.os }}