diff --git a/features/src/cccl-dev/.bashrc b/features/src/cccl-dev/.bashrc
index eb6605aca..5b8e925d3 100644
--- a/features/src/cccl-dev/.bashrc
+++ b/features/src/cccl-dev/.bashrc
@@ -5,7 +5,10 @@ if  [ -f "${USERHOME}/.local/share/venvs/cccl/bin/activate" ] \
  && [ -z "${VIRTUAL_ENV:-}" -o "${VIRTUAL_ENV}" != "${USERHOME}/.local/share/venvs/cccl" ]; then
     . "${USERHOME}/.local/share/venvs/cccl/bin/activate";
 elif [ -n "${VIRTUAL_ENV_PROMPT:-}" ]; then
-    if ! echo "${PS1:-}" | grep -qF "${VIRTUAL_ENV_PROMPT}"; then
+    if ! echo "${VIRTUAL_ENV_PROMPT}" | grep -qE "(.*) "  \
+    && ! echo "${PS1:-}" | grep -qF "(${VIRTUAL_ENV_PROMPT}) "; then
+        export PS1="(${VIRTUAL_ENV_PROMPT}) ${PS1:-}";
+    elif ! echo "${PS1:-}" | grep -qF "${VIRTUAL_ENV_PROMPT}"; then
         export PS1="${VIRTUAL_ENV_PROMPT}${PS1:-}";
     fi
 fi
diff --git a/features/src/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json
index 1b030aa90..d8063d3ee 100644
--- a/features/src/cccl-dev/devcontainer-feature.json
+++ b/features/src/cccl-dev/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA CCCL development utilities",
   "id": "cccl-dev",
-  "version": "26.8.1",
+  "version": "26.8.2",
   "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
     "litVersion": {
diff --git a/features/src/rapids-build-utils/.bashrc b/features/src/rapids-build-utils/.bashrc
index 49db66db4..66d84ac9a 100644
--- a/features/src/rapids-build-utils/.bashrc
+++ b/features/src/rapids-build-utils/.bashrc
@@ -7,20 +7,20 @@ export CUDAARCHS="${CUDAARCHS:-all-major}";
 export CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}";
 export CMAKE_EXPORT_COMPILE_COMMANDS="${CMAKE_EXPORT_COMPILE_COMMANDS:-ON}";
 
-if [[ "${PYTHON_PACKAGE_MANAGER:-}" == "pip" ]]; then
+if [ "${PYTHON_PACKAGE_MANAGER:-}" = "pip" ]; then
     if  [ -n "${DEFAULT_VIRTUAL_ENV:-}" ] \
      && [ -f ~/".local/share/venvs/${DEFAULT_VIRTUAL_ENV}/bin/activate" ] \
      && [ -z "${VIRTUAL_ENV:-}" -o "${VIRTUAL_ENV}" != ~/".local/share/venvs/${DEFAULT_VIRTUAL_ENV}" ]; then
         . ~/".local/share/venvs/${DEFAULT_VIRTUAL_ENV}/bin/activate";
     elif [ -n "${VIRTUAL_ENV_PROMPT:-}" ]; then
-        if ! grep -qE "(.*) " <<< "${VIRTUAL_ENV_PROMPT}" \
-        && ! grep -qF "(${VIRTUAL_ENV_PROMPT}) " <<< "${PS1:-}"; then
+        if ! echo "${VIRTUAL_ENV_PROMPT}" | grep -qE "(.*) " \
+        && ! echo "${PS1:-}" | grep -qF "(${VIRTUAL_ENV_PROMPT}) "; then
             export PS1="(${VIRTUAL_ENV_PROMPT}) ${PS1:-}";
-        elif ! grep -qF "${VIRTUAL_ENV_PROMPT}" <<< "${PS1:-}"; then
+        elif ! echo "${PS1:-}" | grep -qF "${VIRTUAL_ENV_PROMPT}"; then
             export PS1="${VIRTUAL_ENV_PROMPT}${PS1:-}";
         fi
     fi
 fi
 
 # shellcheck disable=SC2155
-export CUDA_VERSION_MAJOR_MINOR="$(grep -Po '^[0-9]+\.[0-9]+' <<< "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}")";
+export CUDA_VERSION_MAJOR_MINOR="$(echo "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}" | grep -Po '^[0-9]+\.[0-9]+')";
diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index c00199b86..69720450d 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.8",
+  "version": "26.8.9",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/matrix.yml b/matrix.yml
index 2a057efb3..26f184f4d 100644
--- a/matrix.yml
+++ b/matrix.yml
@@ -44,8 +44,8 @@ x-openmpi: &openmpi { name: "openmpi", version: "5.0.10" }
 
 x-cccl-dev: &cccl_dev { name: "cccl-dev", hide: true, doxygenVersion: "1.9.6" }
 x-clangd-dev-bionic: &clangd_dev_bionic { name: "llvm", version: "19", packages: "clangd", hide: true }
-x-clangd-dev-jammy: &clangd_dev_jammy { name: "llvm", version: "dev", packages: "clangd", hide: true }
-x-clangd-dev: &clangd_dev { name: "llvm", version: "dev", packages: "clangd", hide: true }
+x-clangd-dev-jammy: &clangd_dev_jammy { name: "llvm", version: "23", packages: "clangd", hide: true }
+x-clangd-dev: &clangd_dev { name: "llvm", version: "23", packages: "clangd", hide: true }
 # Clang utils always available:
 x-clang-extra-cccl: &clang_extra_cccl { name: "llvm", version: "22", packages: "clang-format clang-tidy llvm-tools", hide: true }
 # apt.llvm.org's focal (20.04) arm64 repo is missing clang-format/clang-tidy/llvm-tools for LLVM 22,