diff --git a/features/src/cccl-dev/README.md b/features/src/cccl-dev/README.md
index 9f10aabc..3b70ac0c 100644
--- a/features/src/cccl-dev/README.md
+++ b/features/src/cccl-dev/README.md
@@ -7,7 +7,7 @@ A feature to install NVIDIA CCCL development utilities
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/cccl-dev:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/cccl-dev:25": {}
 }
 ```
 
diff --git a/features/src/cmake/README.md b/features/src/cmake/README.md
index e9171fe3..d27760fd 100644
--- a/features/src/cmake/README.md
+++ b/features/src/cmake/README.md
@@ -7,7 +7,7 @@ A feature to install CMake
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/cmake:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/cmake:25": {}
 }
 ```
 
diff --git a/features/src/cuda/README.md b/features/src/cuda/README.md
index 02935679..5ed0a77b 100644
--- a/features/src/cuda/README.md
+++ b/features/src/cuda/README.md
@@ -7,7 +7,7 @@ A feature to install the NVIDIA CUDA Toolkit
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/cuda:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/cuda:25": {}
 }
 ```
 
diff --git a/features/src/gcc/README.md b/features/src/gcc/README.md
index 4c5af501..1cfc9115 100644
--- a/features/src/gcc/README.md
+++ b/features/src/gcc/README.md
@@ -7,7 +7,7 @@ A feature to install gcc
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/gcc:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/gcc:25": {}
 }
 ```
 
diff --git a/features/src/gitlab-cli/README.md b/features/src/gitlab-cli/README.md
index e2bdf64a..235f2eaf 100644
--- a/features/src/gitlab-cli/README.md
+++ b/features/src/gitlab-cli/README.md
@@ -7,7 +7,7 @@ Installs the GitLab CLI. Auto-detects latest version and installs needed depende
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/gitlab-cli:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/gitlab-cli:25": {}
 }
 ```
 
diff --git a/features/src/llvm/README.md b/features/src/llvm/README.md
index 8c524707..ad6f9359 100644
--- a/features/src/llvm/README.md
+++ b/features/src/llvm/README.md
@@ -7,7 +7,7 @@ A feature to install LLVM compilers and tools
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/llvm:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/llvm:25": {}
 }
 ```
 
diff --git a/features/src/mambaforge/README.md b/features/src/mambaforge/README.md
index f7f6e3ca..33d4d164 100644
--- a/features/src/mambaforge/README.md
+++ b/features/src/mambaforge/README.md
@@ -7,7 +7,7 @@ A feature to install mambaforge
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/mambaforge:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/mambaforge:25": {}
 }
 ```
 
diff --git a/features/src/ninja/README.md b/features/src/ninja/README.md
index 0f79b3cb..e1de9c99 100644
--- a/features/src/ninja/README.md
+++ b/features/src/ninja/README.md
@@ -7,7 +7,7 @@ A feature to install ninja-build
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/ninja:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/ninja:25": {}
 }
 ```
 
diff --git a/features/src/nvhpc/README.md b/features/src/nvhpc/README.md
index 8956c99d..cc0daed7 100644
--- a/features/src/nvhpc/README.md
+++ b/features/src/nvhpc/README.md
@@ -7,7 +7,7 @@ A feature to install the NVHPC SDK
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/nvhpc:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/nvhpc:25": {}
 }
 ```
 
diff --git a/features/src/oneapi/README.md b/features/src/oneapi/README.md
index 5db37dc2..bf240b7f 100644
--- a/features/src/oneapi/README.md
+++ b/features/src/oneapi/README.md
@@ -7,7 +7,7 @@ A feature to install the Intel oneapi toolchain
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/oneapi:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/oneapi:25": {}
 }
 ```
 
diff --git a/features/src/openmpi/README.md b/features/src/openmpi/README.md
index 60ceae16..e2534b3a 100644
--- a/features/src/openmpi/README.md
+++ b/features/src/openmpi/README.md
@@ -7,7 +7,7 @@ A feature to install OpenMPI with optional CUDA and UCX support
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/openmpi:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/openmpi:25": {}
 }
 ```
 
diff --git a/features/src/rapids-build-utils/README.md b/features/src/rapids-build-utils/README.md
index 9dde5c86..b0cd43d6 100644
--- a/features/src/rapids-build-utils/README.md
+++ b/features/src/rapids-build-utils/README.md
@@ -7,7 +7,7 @@ A feature to install the RAPIDS devcontainer build utilities
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:25": {}
 }
 ```
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index edeeec53..ceae24f0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -184,21 +184,6 @@ repos:
         cmake: -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
         install: *rapids_build_backend_args
 
-- name: wholegraph
-  path: wholegraph
-  git: {<<: *git_defaults, repo: wholegraph}
-  cpp:
-    - name: wholegraph
-      sub_dir: cpp
-      depends: [raft]
-      args:
-        cmake: -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
-  python:
-    - name: wholegraph
-      sub_dir: python/pylibwholegraph
-      depends: [wholegraph]
-      args: {install: *rapids_build_backend_args}
-
 - name: cugraph
   path: cugraph
   git: {<<: *git_defaults, repo: cugraph}
@@ -221,23 +206,40 @@ repos:
       sub_dir: python/cugraph
       depends: [cugraph]
       args: {cmake: -DFIND_CUGRAPH_CPP=ON, install: *rapids_build_backend_args}
-    - name: nx-cugraph
-      sub_dir: python/nx-cugraph
+    - name: cugraph-service-client
+      sub_dir: python/cugraph-service/client
+      args: {install: *rapids_build_backend_args}
+    - name: cugraph-service-server
+      sub_dir: python/cugraph-service/server
+      args: {install: *rapids_build_backend_args}
+
+- name: cugraph-gnn
+  path: cugraph-gnn
+  git: {<<: *git_defaults, repo: cugraph-gnn}
+  cpp:
+    - name: wholegraph
+      sub_dir: cpp
+      depends: [raft]
+      args:
+        cmake: -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
+  python:
+    - name: wholegraph
+      sub_dir: python/pylibwholegraph
+      depends: [wholegraph]
       args: {install: *rapids_build_backend_args}
     - name: cugraph-dgl
       sub_dir: python/cugraph-dgl
       args: {install: *rapids_build_backend_args}
-    - name: cugraph-equivariant
-      sub_dir: python/cugraph-equivariant
-      args: {install: *rapids_build_backend_args}
     - name: cugraph_pyg
       sub_dir: python/cugraph-pyg
       args: {install: *rapids_build_backend_args}
-    - name: cugraph-service-client
-      sub_dir: python/cugraph-service/client
-      args: {install: *rapids_build_backend_args}
-    - name: cugraph-service-server
-      sub_dir: python/cugraph-service/server
+
+- name: nx-cugraph
+  path: nx-cugraph
+  git: {<<: *git_defaults, repo: nx-cugraph}
+  python:
+    - name: nx-cugraph
+      sub_dir: .
       args: {install: *rapids_build_backend_args}
 
 - name: cuspatial
diff --git a/features/src/rust/README.md b/features/src/rust/README.md
index a817761f..e058e131 100644
--- a/features/src/rust/README.md
+++ b/features/src/rust/README.md
@@ -7,7 +7,7 @@ Installs Rust, common Rust utilities, and their required dependencies
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/rust:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/rust:25": {}
 }
 ```
 
diff --git a/features/src/sccache/README.md b/features/src/sccache/README.md
index d8aab220..d8999056 100644
--- a/features/src/sccache/README.md
+++ b/features/src/sccache/README.md
@@ -7,7 +7,7 @@ A feature to install sccache
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/sccache:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/sccache:25": {}
 }
 ```
 
diff --git a/features/src/ucx/README.md b/features/src/ucx/README.md
index 1de24992..d1b5071e 100644
--- a/features/src/ucx/README.md
+++ b/features/src/ucx/README.md
@@ -7,7 +7,7 @@ A feature to install UCX
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/ucx:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/ucx:25": {}
 }
 ```
 
diff --git a/features/src/utils/README.md b/features/src/utils/README.md
index 52e18c0f..85f7eddf 100644
--- a/features/src/utils/README.md
+++ b/features/src/utils/README.md
@@ -7,7 +7,7 @@ A feature to install RAPIDS devcontainer utility scripts
 
 ```json
 "features": {
-    "ghcr.io/rapidsai/devcontainers/features/utils:24": {}
+    "ghcr.io/rapidsai/devcontainers/features/utils:25": {}
 }
 ```