diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index aed128d8..c00199b8 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "26.8.7",
+  "version": "26.8.8",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
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 f4cda70c..265ded00 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
@@ -152,7 +152,7 @@ repos:
         args: {install: *rapids_build_backend_args}
   - name: raft
     path: raft
-    git: {!!merge <<: *git_defaults, repo: raft}
+    git: {!!merge <<: *git_defaults, repo: raft, upstream: NVIDIA}
     cpp:
       - name: raft
         sub_dir: cpp
@@ -178,7 +178,7 @@ repos:
         test: ci/run_raft_dask_pytests.sh
   - name: cuvs
     path: cuvs
-    git: {!!merge <<: *git_defaults, repo: cuvs}
+    git: {!!merge <<: *git_defaults, repo: cuvs, upstream: NVIDIA}
     cpp:
       - name: cuvs
         sub_dir: cpp
diff --git a/features/test/_global/scenarios.json b/features/test/_global/scenarios.json
index 2ba1726b..2ebe3aa4 100644
--- a/features/test/_global/scenarios.json
+++ b/features/test/_global/scenarios.json
@@ -22,7 +22,7 @@
         "installZsh": "true",
         "upgradePackages": "true"
       },
-      "git": {
+      "ghcr.io/devcontainers/features/git:1": {
         "ppa": "true",
         "version": "latest"
       },
@@ -53,7 +53,7 @@
     },
     "overrideFeatureInstallOrder": [
       "ghcr.io/devcontainers/features/common-utils",
-      "./git",
+      "ghcr.io/devcontainers/features/git",
       "ghcr.io/devcontainers/features/git-lfs",
       "ghcr.io/devcontainers/features/github-cli",
       "./gitlab-cli",
diff --git a/features/test/utils/scenarios.json b/features/test/utils/scenarios.json
index 10868822..6e8dc5e7 100644
--- a/features/test/utils/scenarios.json
+++ b/features/test/utils/scenarios.json
@@ -20,7 +20,7 @@
         "installZsh": "true",
         "upgradePackages": "true"
       },
-      "git": {
+      "ghcr.io/devcontainers/features/git:1": {
         "ppa": "true",
         "version": "latest"
       },
@@ -36,7 +36,7 @@
     },
     "overrideFeatureInstallOrder": [
       "ghcr.io/devcontainers/features/common-utils",
-      "./git",
+      "ghcr.io/devcontainers/features/git",
       "ghcr.io/devcontainers/features/git-lfs",
       "ghcr.io/devcontainers/features/github-cli",
       "./gitlab-cli",
@@ -67,7 +67,7 @@
         "installZsh": "true",
         "upgradePackages": "true"
       },
-      "git": {
+      "ghcr.io/devcontainers/features/git:1": {
         "ppa": "true",
         "version": "latest"
       },
@@ -83,7 +83,7 @@
     },
     "overrideFeatureInstallOrder": [
       "ghcr.io/devcontainers/features/common-utils",
-      "./git",
+      "ghcr.io/devcontainers/features/git",
       "ghcr.io/devcontainers/features/git-lfs",
       "ghcr.io/devcontainers/features/github-cli",
       "./gitlab-cli",
@@ -114,7 +114,7 @@
         "installZsh": "true",
         "upgradePackages": "true"
       },
-      "git": {
+      "ghcr.io/devcontainers/features/git:1": {
         "ppa": "true",
         "version": "latest"
       },
@@ -130,7 +130,7 @@
     },
     "overrideFeatureInstallOrder": [
       "ghcr.io/devcontainers/features/common-utils",
-      "./git",
+      "ghcr.io/devcontainers/features/git",
       "ghcr.io/devcontainers/features/git-lfs",
       "ghcr.io/devcontainers/features/github-cli",
       "./gitlab-cli",
@@ -161,7 +161,7 @@
         "installZsh": "true",
         "upgradePackages": "true"
       },
-      "git": {
+      "ghcr.io/devcontainers/features/git:1": {
         "ppa": "true",
         "version": "latest"
       },
@@ -177,7 +177,7 @@
     },
     "overrideFeatureInstallOrder": [
       "ghcr.io/devcontainers/features/common-utils",
-      "./git",
+      "ghcr.io/devcontainers/features/git",
       "ghcr.io/devcontainers/features/git-lfs",
       "ghcr.io/devcontainers/features/github-cli",
       "./gitlab-cli",