diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89ad4f70f2..6facf4d386 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -306,7 +306,7 @@ t:fedora41-makefiles-nospace:
         CMAKE_CI_BUILD_NAME: fedora41_makefiles_nospace
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:nvhpc22.11-ninja:
+t:nvhpc24.9-ninja:
     extends:
         - .nvhpc_ninja
         - .cmake_test_linux_release
diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake
index e9c148f80c..f151bf6782 100644
--- a/.gitlab/ci/ctest_exclusions.cmake
+++ b/.gitlab/ci/ctest_exclusions.cmake
@@ -34,13 +34,6 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "_jom")
     )
 endif()
 
-if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "nvhpc_")
-  list(APPEND test_exclusions
-    # FIXME(#24187): This test fails with NVHPC as the CUDA host compiler.
-    "^CudaOnly.SeparateCompilationPTX$"
-    )
-endif()
-
 string(REPLACE ";" "|" test_exclusions "${test_exclusions}")
 if (test_exclusions)
   set(test_exclusions "(${test_exclusions})")
diff --git a/.gitlab/ci/docker/nvhpc22.11/Dockerfile b/.gitlab/ci/docker/nvhpc24.9/Dockerfile
similarity index 75%
rename from .gitlab/ci/docker/nvhpc22.11/Dockerfile
rename to .gitlab/ci/docker/nvhpc24.9/Dockerfile
index 078ae37611..b94b14adda 100644
--- a/.gitlab/ci/docker/nvhpc22.11/Dockerfile
+++ b/.gitlab/ci/docker/nvhpc24.9/Dockerfile
@@ -1,5 +1,5 @@
 # https://catalog.ngc.nvidia.com/orgs/nvidia/containers/nvhpc/tags
-FROM kitware/nvidia-nvhpc:22.11-devel-cuda_multi-ubuntu22.04
+FROM kitware/nvidia-nvhpc:24.9-devel-cuda_multi-ubuntu24.04
 MAINTAINER Brad King <brad.king@kitware.com>
 
 COPY install_deps.sh /root/install_deps.sh
diff --git a/.gitlab/ci/docker/nvhpc22.11/install_deps.sh b/.gitlab/ci/docker/nvhpc24.9/install_deps.sh
similarity index 100%
rename from .gitlab/ci/docker/nvhpc22.11/install_deps.sh
rename to .gitlab/ci/docker/nvhpc24.9/install_deps.sh
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index d6179af462..3fbc812189 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -307,7 +307,7 @@
 ### NVHPC Compiler
 
 .nvhpc:
-    image: "kitware/cmake:ci-nvhpc22.11-x86_64-2022-12-06"
+    image: "kitware/cmake:ci-nvhpc24.9-x86_64-2024-09-27"
     variables:
         CMAKE_ARCH: x86_64