diff --git a/image/.devcontainer/devcontainer.json b/image/.devcontainer/devcontainer.json
index aa17b0dde..fdabcff93 100644
--- a/image/.devcontainer/devcontainer.json
+++ b/image/.devcontainer/devcontainer.json
@@ -22,7 +22,7 @@
       "upgradePackages": "true"
     },
     "ghcr.io/devcontainers/features/git:1.3.2": {
-      "ppa": "true",
+      "ppa": "false",
       "version": "latest"
     },
     "ghcr.io/devcontainers/features/git-lfs:1.2.1": {
diff --git a/matrix.yml b/matrix.yml
index cc1bdd8bb..739283343 100644
--- a/matrix.yml
+++ b/matrix.yml
@@ -13,6 +13,7 @@ x-gcc-11: &gcc_11 { name: "gcc", version: "11" }
 x-gcc-12: &gcc_12 { name: "gcc", version: "12" }
 x-gcc-13: &gcc_13 { name: "gcc", version: "13" }
 x-gcc-14: &gcc_14 { name: "gcc", version: "14" }
+x-gcc-15: &gcc_15 { name: "gcc", version: "15" }
 x-gcc-env: &gcc_env { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++" }
 x-gcc-env-rapids: &gcc_env_rapids { CC: "gcc", CXX: "g++", CUDAHOSTCXX: "g++", PYTHON_VERSION: "3.13" }
 
@@ -115,6 +116,10 @@ include:
   images:
   - { features: [*python, *dood, *gcc_13, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
   - { features: [*python, *dood, *gcc_14, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
+  
+- os: "ubuntu:25.04"
+  images:
+  - { features: [*python, *dood, *gcc_15, { <<: *cuda_curr_max, <<: *cccl_cuda_opts }, *clang_format_cccl, *clangd_dev, *cccl_dev], env: *gcc_env }
 
 - os: "windows"
   images: