diff --git a/.buildkite/release/build.rayci.yml b/.buildkite/release/build.rayci.yml
index c9a07590fbf4..7056cb0c2c5f 100644
--- a/.buildkite/release/build.rayci.yml
+++ b/.buildkite/release/build.rayci.yml
@@ -94,7 +94,7 @@ steps:
       - raycpubaseextra-testdeps
 
   - name: ray-anyscale-cuda-build
-    label: "wanda: ray-anyscale py{{matrix.python}} cu{{matrix.cuda}}"
+    label: "wanda: ray-anyscale py{{matrix.python}} {{matrix.platform}}"
     wanda: ci/docker/ray-anyscale-cuda.wanda.yaml
     env_file: rayci.env
     matrix:
@@ -106,15 +106,15 @@ steps:
           - "3.11"
           - "3.12"
           - "3.13"
-        cuda:
-          - "12.3.2-cudnn9"
+        platform:
+          - "cu12.3.2-cudnn9"
       adjustments:
         - with:
             python: "3.12"
-            cuda: "13.0.0-cudnn"
+            platform: "cu13.0.0-cudnn"
     env:
       PYTHON_VERSION: "{{matrix.python}}"
-      CUDA_VERSION: "{{matrix.cuda}}"
+      PLATFORM: "{{matrix.platform}}"
       ARCH_SUFFIX: ""
     tags:
       - oss
@@ -153,22 +153,22 @@ steps:
             platform: cu13.0.0-cudnn
 
   - name: ray-llm-anyscale-cuda-build
-    label: "wanda: ray-llm-anyscale py{{matrix.python}} cu{{matrix.cuda}}"
+    label: "wanda: ray-llm-anyscale py{{matrix.python}} {{matrix.platform}}"
     wanda: ci/docker/ray-llm-anyscale-cuda.wanda.yaml
     env_file: rayci.env
     matrix:
       setup:
         python:
           - "3.12"
-        cuda:
-          - "13.0.0-cudnn"
+        platform:
+          - "cu13.0.0-cudnn"
       adjustments:
         - with:
             python: "3.11"
-            cuda: "12.8.1-cudnn"
+            platform: "cu12.8.1-cudnn"
     env:
       PYTHON_VERSION: "{{matrix.python}}"
-      CUDA_VERSION: "{{matrix.cuda}}"
+      PLATFORM: "{{matrix.platform}}"
       ARCH_SUFFIX: ""
     tags:
       - oss
@@ -202,7 +202,7 @@ steps:
             platform: "cu12.8.1-cudnn"
 
   - name: ray-ml-anyscale-cuda-build
-    label: "wanda: ray-ml-anyscale py{{matrix.python}} cu{{matrix.cuda}}"
+    label: "wanda: ray-ml-anyscale py{{matrix.python}} {{matrix.platform}}"
     wanda: ci/docker/ray-ml-anyscale-cuda.wanda.yaml
     env_file: rayci.env
     matrix:
@@ -211,11 +211,11 @@ steps:
           # This list should be kept in sync with the list of supported Python in
           # release test suite
           - "3.10"
-        cuda:
-          - "12.1.1-cudnn8"
+        platform:
+          - "cu12.1.1-cudnn8"
     env:
       PYTHON_VERSION: "{{matrix.python}}"
-      CUDA_VERSION: "{{matrix.cuda}}"
+      PLATFORM: "{{matrix.platform}}"
       ARCH_SUFFIX: ""
     tags:
       - oss
diff --git a/ci/docker/ray-anyscale-cuda.wanda.yaml b/ci/docker/ray-anyscale-cuda.wanda.yaml
index d6a8b24e479d..5d9cbe0c2a97 100644
--- a/ci/docker/ray-anyscale-cuda.wanda.yaml
+++ b/ci/docker/ray-anyscale-cuda.wanda.yaml
@@ -4,10 +4,10 @@
 #
 # This produces the anyscale test image for GPU release tests.
 #
-name: "ray-anyscale-py$PYTHON_VERSION-cu$CUDA_VERSION$ARCH_SUFFIX"
+name: "ray-anyscale-py$PYTHON_VERSION-$PLATFORM$ARCH_SUFFIX"
 disable_caching: true
 froms:
-  - "cr.ray.io/rayproject/ray-py$PYTHON_VERSION-cu$CUDA_VERSION-base-extra-testdeps"  # CUDA base with test deps
+  - "cr.ray.io/rayproject/ray-py$PYTHON_VERSION-$PLATFORM-base-extra-testdeps"  # CUDA base with test deps
   - "cr.ray.io/rayproject/ray-wheel-py$PYTHON_VERSION$ARCH_SUFFIX"                    # Ray wheel
 dockerfile: ci/docker/ray-image.Dockerfile
 build_args:
@@ -15,6 +15,6 @@ build_args:
   - ARCH_SUFFIX
   - IMAGE_TYPE=ray
   - BASE_VARIANT=base-extra-testdeps
-  - PLATFORM=cu$CUDA_VERSION
+  - PLATFORM
   - RAY_COMMIT=$BUILDKITE_COMMIT
   - RAY_VERSION
diff --git a/ci/docker/ray-llm-anyscale-cuda.wanda.yaml b/ci/docker/ray-llm-anyscale-cuda.wanda.yaml
index 00d080a1908b..2549e308dacb 100644
--- a/ci/docker/ray-llm-anyscale-cuda.wanda.yaml
+++ b/ci/docker/ray-llm-anyscale-cuda.wanda.yaml
@@ -4,10 +4,10 @@
 #
 # This produces the anyscale test image for ray-llm GPU release tests.
 #
-name: "ray-llm-anyscale-py$PYTHON_VERSION-cu$CUDA_VERSION$ARCH_SUFFIX"
+name: "ray-llm-anyscale-py$PYTHON_VERSION-$PLATFORM$ARCH_SUFFIX"
 disable_caching: true
 froms:
-  - "cr.ray.io/rayproject/ray-llm-py$PYTHON_VERSION-cu$CUDA_VERSION-base-extra-testdeps"  # ray-llm base with test deps
+  - "cr.ray.io/rayproject/ray-llm-py$PYTHON_VERSION-$PLATFORM-base-extra-testdeps"  # ray-llm base with test deps
   - "cr.ray.io/rayproject/ray-wheel-py$PYTHON_VERSION$ARCH_SUFFIX"                        # Ray wheel
 dockerfile: ci/docker/ray-image.Dockerfile
 build_args:
@@ -15,6 +15,6 @@ build_args:
   - ARCH_SUFFIX
   - BASE_VARIANT=base-extra-testdeps
   - IMAGE_TYPE=ray-llm
-  - PLATFORM=cu$CUDA_VERSION
+  - PLATFORM
   - RAY_COMMIT=$BUILDKITE_COMMIT
   - RAY_VERSION
diff --git a/ci/docker/ray-ml-anyscale-cuda.wanda.yaml b/ci/docker/ray-ml-anyscale-cuda.wanda.yaml
index 1b5aa408feb1..97366e7428eb 100644
--- a/ci/docker/ray-ml-anyscale-cuda.wanda.yaml
+++ b/ci/docker/ray-ml-anyscale-cuda.wanda.yaml
@@ -4,10 +4,10 @@
 #
 # This produces the anyscale test image for ray-ml GPU release tests.
 #
-name: "ray-ml-anyscale-py$PYTHON_VERSION-cu$CUDA_VERSION$ARCH_SUFFIX"
+name: "ray-ml-anyscale-py$PYTHON_VERSION-$PLATFORM$ARCH_SUFFIX"
 disable_caching: true
 froms:
-  - "cr.ray.io/rayproject/ray-ml-py$PYTHON_VERSION-cu$CUDA_VERSION-base-extra-testdeps"  # ray-ml base with test deps
+  - "cr.ray.io/rayproject/ray-ml-py$PYTHON_VERSION-$PLATFORM-base-extra-testdeps"  # ray-ml base with test deps
   - "cr.ray.io/rayproject/ray-wheel-py$PYTHON_VERSION$ARCH_SUFFIX"                       # Ray wheel
 dockerfile: ci/docker/ray-image.Dockerfile
 build_args:
@@ -15,6 +15,6 @@ build_args:
   - ARCH_SUFFIX
   - BASE_VARIANT=base-extra-testdeps
   - IMAGE_TYPE=ray-ml
-  - PLATFORM=cu$CUDA_VERSION
+  - PLATFORM
   - RAY_COMMIT=$BUILDKITE_COMMIT
   - RAY_VERSION