diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 2f0af170..bc142e43 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -34,7 +34,7 @@ permissions:
 
 env:
   ## CUDA version and container operating system
-  CUDA_VERSION: 12.5.1
+  CUDA_VERSION: 13.0.2
   CUDA_OS: ubuntu24.04
   
   ## Default versions are specified in packages.yaml but can be overridden
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2e57257..29737721 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   SINGULARITY_IMAGE: quay.io/singularity/singularity:v3.11.5
 
   ## CUDA version and container operating system
-  CUDA_VERSION: 12.5.1
+  CUDA_VERSION: 13.0.2
   CUDA_OS: ubuntu24.04
 
   ## Default versions are specified in packages.yaml but can be overridden
diff --git a/spack-packages.sh b/spack-packages.sh
index 14449e5b..0184a271 100644
--- a/spack-packages.sh
+++ b/spack-packages.sh
@@ -71,6 +71,7 @@ be6546b82b43d82edba804f1e362a709809ba537
 f5742718da7bd1d078ddc8423011a82ef2e3c759
 56e5282f7ef78180895b5d99db57d2a166b6d0e1
 922b2f6011dbf01aebb332a1ebf949b105c74247
+a5b8ca84d4c3b7c811885c5dd26e0e1d4262d8ce
 ---
 ## Optional hash table with comma-separated file list
 ## For these commits, the cherry-pick will be restricted to the listed files only.
@@ -147,4 +148,5 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
 ## be6546b82b43d82edba804f1e362a709809ba537: gaudi: allow newer fmt for v39
 ## f5742718da7bd1d078ddc8423011a82ef2e3c759: gaudi: workaround test-dependency bug with a when
 ## 56e5282f7ef78180895b5d99db57d2a166b6d0e1: celeritas: new versions 0.6.1, 0.6.2
-## 922b2f6011dbf01aebb332a1ebf949b105c74247: celeritas: add v0.6.3
\ No newline at end of file
+## 922b2f6011dbf01aebb332a1ebf949b105c74247: celeritas: add v0.6.3
+## a5b8ca84d4c3b7c811885c5dd26e0e1d4262d8ce: cudnn: add through v9.17.0 (support CUDA 13)