diff --git a/tools/scripts/generate_binary_build_matrix.py b/tools/scripts/generate_binary_build_matrix.py
index 8815dd25fb..25f15ab414 100755
--- a/tools/scripts/generate_binary_build_matrix.py
+++ b/tools/scripts/generate_binary_build_matrix.py
@@ -151,15 +151,15 @@ def initialize_globals(channel: str, build_python_only: bool) -> None:
     else:
         PYTHON_ARCHES = PYTHON_ARCHES_DICT[channel]
     WHEEL_CONTAINER_IMAGES = {
-       "11.8": "pytorch/manylinux-builder:cuda11.8",
-       "12.1": "pytorch/manylinux-builder:cuda12.1",
-       "12.4": "pytorch/manylinux-builder:cuda12.4",
-       "12.6": "pytorch/manylinux2_28-builder:cuda12.6",
+        **{
+            gpu_arch: f"pytorch/manylinux2_28-builder:cuda{gpu_arch}"
+            for gpu_arch in CUDA_ARCHES
+        },
         **{
             gpu_arch: f"pytorch/manylinux2_28-builder:rocm{gpu_arch}"
             for gpu_arch in ROCM_ARCHES
         },
-        CPU: "pytorch/manylinux-builder:cpu",
+        CPU: "pytorch/manylinux2_28-builder:cpu",
         XPU: "pytorch/manylinux2_28-builder:xpu",
         # TODO: Migrate CUDA_AARCH64 image to manylinux2_28_aarch64-builder:cuda12.4
         CPU_AARCH64: "pytorch/manylinux2_28_aarch64-builder:cpu-aarch64",
diff --git a/tools/tests/assets/build_matrix_linux_wheel_cuda.json b/tools/tests/assets/build_matrix_linux_wheel_cuda.json
index 719bdbbfb7..50159bfb90 100644
--- a/tools/tests/assets/build_matrix_linux_wheel_cuda.json
+++ b/tools/tests/assets/build_matrix_linux_wheel_cuda.json
@@ -5,7 +5,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cpu",
       "validation_runner": "linux.2xlarge",
@@ -20,7 +20,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -35,7 +35,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -95,7 +95,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cpu",
       "validation_runner": "linux.2xlarge",
@@ -110,7 +110,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -125,7 +125,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -185,7 +185,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cpu",
       "validation_runner": "linux.2xlarge",
@@ -200,7 +200,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -215,7 +215,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -275,7 +275,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cpu",
       "validation_runner": "linux.2xlarge",
@@ -290,7 +290,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -305,7 +305,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -365,7 +365,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cpu",
       "validation_runner": "linux.2xlarge",
@@ -380,7 +380,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -395,7 +395,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
diff --git a/tools/tests/assets/build_matrix_linux_wheel_cuda_norocm.json b/tools/tests/assets/build_matrix_linux_wheel_cuda_norocm.json
index 1af8daf1a8..45bf2d1c34 100644
--- a/tools/tests/assets/build_matrix_linux_wheel_cuda_norocm.json
+++ b/tools/tests/assets/build_matrix_linux_wheel_cuda_norocm.json
@@ -5,7 +5,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cpu",
       "validation_runner": "linux.2xlarge",
@@ -20,7 +20,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -35,7 +35,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -65,7 +65,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cpu",
       "validation_runner": "linux.2xlarge",
@@ -80,7 +80,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -95,7 +95,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -125,7 +125,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cpu",
       "validation_runner": "linux.2xlarge",
@@ -140,7 +140,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -155,7 +155,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -185,7 +185,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cpu",
       "validation_runner": "linux.2xlarge",
@@ -200,7 +200,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -215,7 +215,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -245,7 +245,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cpu",
       "validation_runner": "linux.2xlarge",
@@ -260,7 +260,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -275,7 +275,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
diff --git a/tools/tests/assets/build_matrix_linux_wheel_nocpu.json b/tools/tests/assets/build_matrix_linux_wheel_nocpu.json
index 536c79eff5..dc02613ca8 100644
--- a/tools/tests/assets/build_matrix_linux_wheel_nocpu.json
+++ b/tools/tests/assets/build_matrix_linux_wheel_nocpu.json
@@ -5,7 +5,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -20,7 +20,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -80,7 +80,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -95,7 +95,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -155,7 +155,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -170,7 +170,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -230,7 +230,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -245,7 +245,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -305,7 +305,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -320,7 +320,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
diff --git a/tools/tests/assets/build_matrix_linux_wheel_xpu.json b/tools/tests/assets/build_matrix_linux_wheel_xpu.json
index cdb2afc7da..2aa43f60dc 100644
--- a/tools/tests/assets/build_matrix_linux_wheel_xpu.json
+++ b/tools/tests/assets/build_matrix_linux_wheel_xpu.json
@@ -5,7 +5,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -20,7 +20,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_9-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -65,7 +65,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -80,7 +80,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_10-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -125,7 +125,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -140,7 +140,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_11-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -185,7 +185,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -200,7 +200,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_12-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -245,7 +245,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cuda11_8",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
@@ -260,7 +260,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "manywheel",
       "build_name": "manywheel-py3_13-cuda12_4",
       "validation_runner": "linux.g5.4xlarge.nvidia.gpu",
diff --git a/tools/tests/assets/build_matrix_macos_wheel.json b/tools/tests/assets/build_matrix_macos_wheel.json
index 4c492f6df1..e8a2051c0e 100644
--- a/tools/tests/assets/build_matrix_macos_wheel.json
+++ b/tools/tests/assets/build_matrix_macos_wheel.json
@@ -5,7 +5,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_9-cpu",
       "validation_runner": "linux.2xlarge",
@@ -20,7 +20,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_10-cpu",
       "validation_runner": "linux.2xlarge",
@@ -35,7 +35,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_11-cpu",
       "validation_runner": "linux.2xlarge",
@@ -50,7 +50,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_12-cpu",
       "validation_runner": "linux.2xlarge",
@@ -65,7 +65,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_13-cpu",
       "validation_runner": "linux.2xlarge",
diff --git a/tools/tests/assets/build_matrix_windows_wheel_cuda.json b/tools/tests/assets/build_matrix_windows_wheel_cuda.json
index 966ba6e0bb..a26d9d0910 100644
--- a/tools/tests/assets/build_matrix_windows_wheel_cuda.json
+++ b/tools/tests/assets/build_matrix_windows_wheel_cuda.json
@@ -5,7 +5,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_9-cpu",
       "validation_runner": "windows.4xlarge",
@@ -20,7 +20,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "wheel",
       "build_name": "wheel-py3_9-cuda11_8",
       "validation_runner": "windows.g4dn.xlarge",
@@ -35,7 +35,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "wheel",
       "build_name": "wheel-py3_9-cuda12_4",
       "validation_runner": "windows.g4dn.xlarge",
@@ -80,7 +80,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_10-cpu",
       "validation_runner": "windows.4xlarge",
@@ -95,7 +95,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "wheel",
       "build_name": "wheel-py3_10-cuda11_8",
       "validation_runner": "windows.g4dn.xlarge",
@@ -110,7 +110,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "wheel",
       "build_name": "wheel-py3_10-cuda12_4",
       "validation_runner": "windows.g4dn.xlarge",
@@ -155,7 +155,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_11-cpu",
       "validation_runner": "windows.4xlarge",
@@ -170,7 +170,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "wheel",
       "build_name": "wheel-py3_11-cuda11_8",
       "validation_runner": "windows.g4dn.xlarge",
@@ -185,7 +185,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "wheel",
       "build_name": "wheel-py3_11-cuda12_4",
       "validation_runner": "windows.g4dn.xlarge",
@@ -230,7 +230,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_12-cpu",
       "validation_runner": "windows.4xlarge",
@@ -245,7 +245,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "wheel",
       "build_name": "wheel-py3_12-cuda11_8",
       "validation_runner": "windows.g4dn.xlarge",
@@ -260,7 +260,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "wheel",
       "build_name": "wheel-py3_12-cuda12_4",
       "validation_runner": "windows.g4dn.xlarge",
@@ -305,7 +305,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_13-cpu",
       "validation_runner": "windows.4xlarge",
@@ -320,7 +320,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "11.8",
       "desired_cuda": "cu118",
-      "container_image": "pytorch/manylinux-builder:cuda11.8",
+      "container_image": "pytorch/manylinux2_28-builder:cuda11.8",
       "package_type": "wheel",
       "build_name": "wheel-py3_13-cuda11_8",
       "validation_runner": "windows.g4dn.xlarge",
@@ -335,7 +335,7 @@
       "gpu_arch_type": "cuda",
       "gpu_arch_version": "12.4",
       "desired_cuda": "cu124",
-      "container_image": "pytorch/manylinux-builder:cuda12.4",
+      "container_image": "pytorch/manylinux2_28-builder:cuda12.4",
       "package_type": "wheel",
       "build_name": "wheel-py3_13-cuda12_4",
       "validation_runner": "windows.g4dn.xlarge",
diff --git a/tools/tests/assets/build_matrix_windows_wheel_xpu.json b/tools/tests/assets/build_matrix_windows_wheel_xpu.json
index 2b49fc9284..8470d1ede7 100644
--- a/tools/tests/assets/build_matrix_windows_wheel_xpu.json
+++ b/tools/tests/assets/build_matrix_windows_wheel_xpu.json
@@ -5,7 +5,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_9-cpu",
       "validation_runner": "windows.4xlarge",
@@ -35,7 +35,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_10-cpu",
       "validation_runner": "windows.4xlarge",
@@ -65,7 +65,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_11-cpu",
       "validation_runner": "windows.4xlarge",
@@ -95,7 +95,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_12-cpu",
       "validation_runner": "windows.4xlarge",
@@ -125,7 +125,7 @@
       "gpu_arch_type": "cpu",
       "gpu_arch_version": "",
       "desired_cuda": "cpu",
-      "container_image": "pytorch/manylinux-builder:cpu",
+      "container_image": "pytorch/manylinux2_28-builder:cpu",
       "package_type": "wheel",
       "build_name": "wheel-py3_13-cpu",
       "validation_runner": "windows.4xlarge",