diff --git a/.github/workflows/bazel_tests.yml b/.github/workflows/bazel_tests.yml
index 44c56f31cc..33d5b06a3f 100644
--- a/.github/workflows/bazel_tests.yml
+++ b/.github/workflows/bazel_tests.yml
@@ -14,7 +14,7 @@ jobs:
   ubuntu:
     runs-on: ${{ matrix.os }}
     env:
-      BAZEL_CACHE: --remote_cache=https://storage.googleapis.com/protobuf-bazel-cache
+      BAZEL_CACHE: --remote_cache=https://storage.googleapis.com/protobuf-bazel-cache/upb
 
     strategy:
       fail-fast: false   # Don't cancel all jobs if one fails.
diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
index f0bbcc24b1..2f38aea054 100644
--- a/.github/workflows/python_tests.yml
+++ b/.github/workflows/python_tests.yml
@@ -16,7 +16,7 @@ jobs:
     if: ${{ github.event.pull_request.head.repo.full_name == 'protocolbuffers/upb' }}
     env:
       DOCKER_IMAGE: gcr.io/protobuf-build/bazel/linux@sha256:2bfd061284eff8234f2fcca16d71d43c69ccf3a22206628b54c204a6a9aac277
-      BAZEL_CACHE: --remote_cache=https://storage.googleapis.com/protobuf-bazel-cache --google_default_credentials
+      BAZEL_CACHE: --remote_cache=https://storage.googleapis.com/protobuf-bazel-cache/upb --google_default_credentials
 
     steps:
       - uses: actions/checkout@v2