diff --git a/.pfnci/wheel-windows/_flexci.ps1 b/.pfnci/wheel-windows/_flexci.ps1
index 38d74d5..b28f7e3 100644
--- a/.pfnci/wheel-windows/_flexci.ps1
+++ b/.pfnci/wheel-windows/_flexci.ps1
@@ -56,8 +56,10 @@ function ActivateCUDA($version) {
         $Env:CUDA_PATH = $Env:CUDA_PATH_V12_4
     } elseif ($version -eq "12.5") {
         $Env:CUDA_PATH = $Env:CUDA_PATH_V12_5
+    } elseif ($version -eq "12.6") {
+        $Env:CUDA_PATH = $Env:CUDA_PATH_V12_6
     } elseif ($version -eq "12.x") {
-        $Env:CUDA_PATH = $Env:CUDA_PATH_V12_5
+        $Env:CUDA_PATH = $Env:CUDA_PATH_V12_6
     } else {
         throw "Unsupported CUDA version: $version"
     }
diff --git a/builder/base/cuda-runfile/build.sh b/builder/base/cuda-runfile/build.sh
index fc526ca..7ab6786 100755
--- a/builder/base/cuda-runfile/build.sh
+++ b/builder/base/cuda-runfile/build.sh
@@ -142,6 +142,17 @@ case ${CUDA} in
     IMAGE_SUFFIX="el8"
     PLATFORM="linux/arm64"
     ;;
+  12.6 )
+    CUDA_VERSION="12.6.0"
+    CUDA_INSTALLER_URL="https://developer.download.nvidia.com/compute/cuda/12.6.0/local_installers/cuda_12.6.0_560.28.03_linux.run"
+    ;;
+  12.6-aarch64 )
+    CUDA_VERSION="12.6.0"
+    CUDA_INSTALLER_URL="https://developer.download.nvidia.com/compute/cuda/12.6.0/local_installers/cuda_12.6.0_560.28.03_linux_sbsa.run"
+    BASE_IMAGE="oraclelinux:8"
+    IMAGE_SUFFIX="el8"
+    PLATFORM="linux/arm64"
+    ;;
 
   * )
     echo "Unknown CUDA version: ${CUDA}"
diff --git a/dist_config.py b/dist_config.py
index 9149bcc..64f46d5 100644
--- a/dist_config.py
+++ b/dist_config.py
@@ -89,7 +89,7 @@
         'platform_version': '12.x',
         # Use the latest CUDA version for build.
         # Note: CUDA 12 still supports RHEL/CentOS 7 on x86_64
-        'image': 'cupy/cupy-release-tools:cuda-runfile-12.5.0-centos7',
+        'image': 'cupy/cupy-release-tools:cuda-runfile-12.6.0-centos7',
         'libs': [],
         'includes': [],
         'preloads': ['cutensor', 'nccl', 'cudnn'],
@@ -102,6 +102,7 @@
             '12.3.0-runtime-ubuntu22.04',
             '12.4.0-runtime-ubuntu22.04',
             '12.5.0-runtime-ubuntu22.04',
+            '12.6.0-runtime-ubuntu22.04',
         ],
         'system_packages': '',
     },
@@ -112,7 +113,7 @@
         'arch': 'aarch64',
         'platform_version': '12.x',
         # Use the latest image.
-        'image': 'cupy/cupy-release-tools:cuda-runfile-12.5.0-el8',
+        'image': 'cupy/cupy-release-tools:cuda-runfile-12.6.0-el8',
         'libs': [],
         'includes': [],
         'preloads': [],
@@ -126,6 +127,7 @@
             '12.3.0-runtime-ubi8',
             '12.4.0-runtime-ubi8',
             '12.5.0-runtime-ubi8',
+            '12.6.0-runtime-ubi8',
         ],
         'system_packages': '',
     },
@@ -178,7 +180,7 @@
         'libs': [],
         'preloads': ['cutensor', 'cudnn'],
         'cudart_lib': 'cudart64_12',  # binary compatible between CUDA 12.x
-        'check_version': lambda x: 12050 <= x < 12060,  # CUDA 12.5
+        'check_version': lambda x: 12060 <= x < 12070,  # CUDA 12.6
     }
 }