diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index 854f93484c..4b36b561c2 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -31,19 +31,19 @@ jobs:
 
           # Override cases with custom images
           - config: { name: "Bazel7", flags: --noenable_bzlmod }
-            version: Bazel7
+            cache_key: Bazel7
             image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e"
             targets: "//src/... //third_party/utf8_range/..."
           - config: { name: "Bazel7 with Bzlmod", flags: --enable_bzlmod --enable_workspace }
-            version: Bazel7bzlmod
+            cache_key: Bazel7bzlmod
             image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e"
             targets: "//src/... //third_party/utf8_range/..."
           - config: { name: "TCMalloc" }
-            version: TcMalloc
+            cache_key: TcMalloc
             image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:1c5133455481f4d1bb8afa477029604f41f1a3c46cebe4d9958cf1af95b5c87c"
             targets: "//src/... //third_party/utf8_range/..."
           - config: { name: "aarch64" }
-            version: TcMalloc
+            cache_key: TcMalloc
             targets: "//src/... //src/google/protobuf/compiler:protoc_aarch64_test //third_party/utf8_range/..."
             image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:6.3.0-aarch64-68e662b3a56b881804dc4e9d45f949791cbc4b94"
     name: Linux ${{ matrix.config.name }}
@@ -58,7 +58,7 @@ jobs:
         with:
           image: ${{ matrix.image }}
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
-          bazel-cache: cpp_linux/${{ matrix.version }}
+          bazel-cache: cpp_linux/${{ matrix.cache_key }}
           bazel: test ${{ matrix.targets }} ${{ matrix.config.flags }}
           exclude-targets: ${{ matrix.exclude-targets }}
 
diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml
index 64639b9d31..189e5c2907 100644
--- a/.github/workflows/test_java.yml
+++ b/.github/workflows/test_java.yml
@@ -18,31 +18,31 @@ jobs:
       matrix:
         include:
           - name: OpenJDK 8
-            version: '8'
+            cache_key: '8'
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
             # TODO: b/318555165 - enable the layering check. Currently it does
             # not work correctly with the toolchain in this Docker image.
             targets: //java/... //java/internal:java_version //compatibility/... --features=-layering_check
           - name: OpenJDK 11
-            version: '11'
+            cache_key: '11'
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
             targets: //java/... //java/internal:java_version //compatibility/...
           - name: OpenJDK 17
-            version: '17'
+            cache_key: '17'
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-1fdbb997433cb22c1e49ef75ad374a8d6bb88702
             targets: //java/... //java/internal:java_version //compatibility/...
           - name: Bazel7
-            version: 'bazel7nobzlmod'
+            cache_key: 'bazel7nobzlmod'
             image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
             targets: //java/... //java/internal:java_version //compatibility/...
             flags: --noenable_bzlmod
           - name: Bazel7 with Bzlmod
-            version: 'bazel7bzlmod'
+            cache_key: 'bazel7bzlmod'
             image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
             targets: //java/... //java/internal:java_version //compatibility/...
             flags: --enable_bzlmod --enable_workspace
           - name: aarch64
-            version: 'aarch64'
+            cache_key: 'aarch64'
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-63dd26c0c7a808d92673a3e52e848189d4ab0f17
             targets: //java/... //compatibility/... //src/google/protobuf/compiler:protoc_aarch64_test
 
@@ -58,7 +58,7 @@ jobs:
         with:
           image: ${{ matrix.image }}
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
-          bazel-cache: java_linux/${{ matrix.version }}
+          bazel-cache: java_linux/${{ matrix.cache_key }}
           bazel: test ${{ matrix.targets }} ${{ matrix.flags }} --test_env=KOKORO_JAVA_VERSION
 
 # TODO restore this test (or a better one) when gRPC has rebuilt with 26.x