diff --git a/CMakePresets.json b/CMakePresets.json
index aa141966524..360ce8cebcc 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -13,7 +13,7 @@
       "binaryDir": "${sourceDir}/build/$env{CCCL_BUILD_INFIX}/${presetName}",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_CUDA_ARCHITECTURES": "60;70;80",
+        "CMAKE_CUDA_ARCHITECTURES": "60;70;90",
         "CCCL_ENABLE_LIBCUDACXX": false,
         "CCCL_ENABLE_CUB": false,
         "CCCL_ENABLE_THRUST": false,
diff --git a/ci/build_common.sh b/ci/build_common.sh
index e7dd5045e12..7e38be1d4ed 100755
--- a/ci/build_common.sh
+++ b/ci/build_common.sh
@@ -70,6 +70,8 @@ CUDA_COMPILER=$(which ${CUDA_COMPILER})
 
 if [[ -n "${CUDA_ARCHS}" ]]; then
     GLOBAL_CMAKE_OPTIONS+=("-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHS}")
+elif [[ "${CUDA_COMPILER}" =~ "11.1" ]]; then
+    GLOBAL_CMAKE_OPTIONS+=("-DCMAKE_CUDA_ARCHITECTURES=\"60;70;80\"")
 fi
 
 if [ $VERBOSE ]; then
diff --git a/ci/matrix.yaml b/ci/matrix.yaml
index b4ed37794d4..e2c67fa2675 100644
--- a/ci/matrix.yaml
+++ b/ci/matrix.yaml
@@ -1,5 +1,6 @@
 
 cuda_oldest: &cuda_oldest '11.1'
+cuda_pre12:  &cuda_pre12  '11.8'
 cuda_newest: &cuda_newest '12.3'
 
 # The GPUs to test on
@@ -66,6 +67,7 @@ pull_request:
     - {cuda: *cuda_newest, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc8,     std: [11, 14, 17],     jobs: ['build']}
     - {cuda: *cuda_newest, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc9,     std: [11, 14, 17],     jobs: ['build']}
     - {cuda: *cuda_newest, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc10,    std: [11, 14, 17, 20], jobs: ['build']}
+    - {cuda: *cuda_pre12,  os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc10,    std: [11, 14, 17],     jobs: ['build']}
     - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: *gcc11,    std: [11, 14, 17, 20], jobs: ['build']}
     - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'amd64', compiler: *gcc12,    std: [11, 14, 17, 20], jobs: ['build', 'test']}
     - {cuda: *cuda_newest, os: 'ubuntu22.04', cpu: 'arm64', compiler: *gcc12,    std: [11, 14, 17, 20], jobs: ['build']}