From bf357fa48131743376bafd3a9c8e186eadf8dcfd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 13:37:18 +0000
Subject: [PATCH 01/16] Initial plan


From 8c41a7462b6d04a278717d9b6e45997cdefecd17 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 13:42:16 +0000
Subject: [PATCH 02/16] Add common-setup.sh helper script with user selection
 logic and comprehensive tests

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/_common/common-setup.sh       |  78 ++++++++++++
 test/_common/test-common-setup.sh | 203 ++++++++++++++++++++++++++++++
 2 files changed, 281 insertions(+)
 create mode 100644 src/_common/common-setup.sh
 create mode 100755 test/_common/test-common-setup.sh

diff --git a/src/_common/common-setup.sh b/src/_common/common-setup.sh
new file mode 100644
index 000000000..550fd9bed
--- /dev/null
+++ b/src/_common/common-setup.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            resolved_username="${_REMOTE_USER}"
+        else
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/test/_common/test-common-setup.sh b/test/_common/test-common-setup.sh
new file mode 100755
index 000000000..e2a5a6dcb
--- /dev/null
+++ b/test/_common/test-common-setup.sh
@@ -0,0 +1,203 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Tests for common-setup.sh helper functions
+# These tests validate the determine_user_from_input function
+#-------------------------------------------------------------------------------------------------------------------------
+
+set -e
+
+# Source the helper script
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../../src/_common/common-setup.sh"
+
+# Test counters
+PASSED=0
+FAILED=0
+TOTAL=0
+
+# Helper function to run a test
+run_test() {
+    local test_name="$1"
+    local expected="$2"
+    local actual="$3"
+    
+    TOTAL=$((TOTAL + 1))
+    
+    if [ "${expected}" = "${actual}" ]; then
+        echo "✓ PASS: ${test_name}"
+        PASSED=$((PASSED + 1))
+    else
+        echo "✗ FAIL: ${test_name}"
+        echo "  Expected: '${expected}'"
+        echo "  Actual:   '${actual}'"
+        FAILED=$((FAILED + 1))
+    fi
+}
+
+# Test 1: Automatic mode finds existing user or fallback
+test_automatic_no_users() {
+    local result=$(determine_user_from_input "automatic")
+    # Should find either a known user or fallback to root
+    # On this system, there may be a UID 1000 user (like packer)
+    local uid_1000_user=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')
+    local expected="${uid_1000_user:-root}"
+    run_test "Automatic mode with no matching common users finds UID 1000 or root" "${expected}" "${result}"
+}
+
+# Test 2: Automatic mode with fallback user
+test_automatic_with_fallback() {
+    local result=$(determine_user_from_input "automatic" "vscode")
+    # Should find a user or use the fallback - check if UID 1000 exists
+    local uid_1000_user=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')
+    local expected="${uid_1000_user:-vscode}"
+    run_test "Automatic mode with custom fallback finds UID 1000 or uses fallback" "${expected}" "${result}"
+}
+
+# Test 3: Explicit "none" should return root
+test_none_returns_root() {
+    local result=$(determine_user_from_input "none")
+    run_test "Explicit 'none' returns root" "root" "${result}"
+}
+
+# Test 4: Explicit "none" ignores fallback
+test_none_ignores_fallback() {
+    local result=$(determine_user_from_input "none" "vscode")
+    run_test "Explicit 'none' ignores fallback" "root" "${result}"
+}
+
+# Test 5: Existing user (root) should return root
+test_existing_user_root() {
+    local result=$(determine_user_from_input "root")
+    run_test "Existing user 'root' returns root" "root" "${result}"
+}
+
+# Test 6: Non-existing user should return root
+test_nonexisting_user() {
+    local result=$(determine_user_from_input "nonexistentuser12345")
+    run_test "Non-existing user returns root" "root" "${result}"
+}
+
+# Test 7: Auto mode (synonym for automatic)
+test_auto_synonym() {
+    local result=$(determine_user_from_input "auto" "customfallback")
+    # Should behave same as automatic - find UID 1000 or use fallback
+    local uid_1000_user=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')
+    local expected="${uid_1000_user:-customfallback}"
+    run_test "Auto mode with fallback finds UID 1000 or uses fallback" "${expected}" "${result}"
+}
+
+# Test 8: _REMOTE_USER environment variable (when set and not root)
+test_remote_user_set() {
+    # Test with an existing user (root is always available)
+    # We'll use a user that exists on the system
+    local existing_user=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo 'root')
+    
+    export _REMOTE_USER="${existing_user}"
+    local result=$(determine_user_from_input "automatic")
+    unset _REMOTE_USER
+    
+    run_test "_REMOTE_USER set to non-root user" "${existing_user}" "${result}"
+}
+
+# Test 9: _REMOTE_USER set to root should use fallback logic
+test_remote_user_root() {
+    export _REMOTE_USER="root"
+    local result=$(determine_user_from_input "automatic" "mydefault")
+    unset _REMOTE_USER
+    
+    # Should use fallback logic - find UID 1000 or use fallback
+    local uid_1000_user=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')
+    local expected="${uid_1000_user:-mydefault}"
+    run_test "_REMOTE_USER set to root uses fallback logic" "${expected}" "${result}"
+}
+
+# Test 10: Finding vscode user if it exists
+test_find_vscode_user() {
+    # Check if vscode user exists
+    if id -u vscode > /dev/null 2>&1; then
+        local result=$(determine_user_from_input "automatic")
+        # Should find vscode (it's second in priority after devcontainer)
+        run_test "Finds vscode user in automatic mode" "vscode" "${result}"
+    else
+        # Skip this test if vscode user doesn't exist
+        run_test "Finds vscode user in automatic mode (SKIPPED - user doesn't exist)" "SKIP" "SKIP"
+    fi
+}
+
+# Test 11: Finding devcontainer user (highest priority)
+test_find_devcontainer_user() {
+    # Check if devcontainer user exists
+    if id -u devcontainer > /dev/null 2>&1; then
+        local result=$(determine_user_from_input "automatic")
+        # Should find devcontainer (highest priority)
+        run_test "Finds devcontainer user (highest priority)" "devcontainer" "${result}"
+    else
+        # Skip this test if devcontainer user doesn't exist
+        run_test "Finds devcontainer user (highest priority) (SKIPPED - user doesn't exist)" "SKIP" "SKIP"
+    fi
+}
+
+# Test 12: Finding user with UID 1000
+test_find_uid_1000() {
+    # Check if there's a user with UID 1000
+    local uid_1000_user=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')
+    
+    if [ -n "${uid_1000_user}" ] && \
+       ! id -u devcontainer > /dev/null 2>&1 && \
+       ! id -u vscode > /dev/null 2>&1 && \
+       ! id -u node > /dev/null 2>&1 && \
+       ! id -u codespace > /dev/null 2>&1; then
+        # Only test if UID 1000 exists and no higher priority users exist
+        local result=$(determine_user_from_input "automatic")
+        run_test "Finds user with UID 1000" "${uid_1000_user}" "${result}"
+    else
+        # Skip this test if conditions aren't met
+        run_test "Finds user with UID 1000 (SKIPPED - conditions not met)" "SKIP" "SKIP"
+    fi
+}
+
+# Test 13: Empty input defaults to "automatic"
+test_empty_input() {
+    local result=$(determine_user_from_input "" "mydefault")
+    # Should behave as automatic mode - find UID 1000 or use fallback
+    local uid_1000_user=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')
+    local expected="${uid_1000_user:-mydefault}"
+    run_test "Empty input treated as automatic and finds UID 1000 or uses fallback" "${expected}" "${result}"
+}
+
+# Run all tests
+echo "Running tests for common-setup.sh..."
+echo "======================================"
+echo ""
+
+test_automatic_no_users
+test_automatic_with_fallback
+test_none_returns_root
+test_none_ignores_fallback
+test_existing_user_root
+test_nonexisting_user
+test_auto_synonym
+test_remote_user_set
+test_remote_user_root
+test_find_vscode_user
+test_find_devcontainer_user
+test_find_uid_1000
+test_empty_input
+
+# Print summary
+echo ""
+echo "======================================"
+echo "Test Summary:"
+echo "  Total:  ${TOTAL}"
+echo "  Passed: ${PASSED}"
+echo "  Failed: ${FAILED}"
+echo "======================================"
+
+# Exit with appropriate code
+if [ ${FAILED} -eq 0 ]; then
+    echo "All tests passed! ✓"
+    exit 0
+else
+    echo "Some tests failed! ✗"
+    exit 1
+fi

From 8c1c8dcfacc90cdef58fe77f3de0c20b0597e15e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 13:47:16 +0000
Subject: [PATCH 03/16] Update all feature scripts to use common-setup.sh
 helper for user selection

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/anaconda/install.sh                 | 20 +++++-------------
 src/common-utils/main.sh                | 28 ++++++++-----------------
 src/conda/install.sh                    | 20 +++++-------------
 src/desktop-lite/install.sh             | 20 +++++-------------
 src/docker-in-docker/install.sh         | 20 +++++-------------
 src/docker-outside-of-docker/install.sh | 20 +++++-------------
 src/go/install.sh                       | 20 +++++-------------
 src/hugo/install.sh                     | 20 +++++-------------
 src/java/install.sh                     | 20 +++++-------------
 src/kubectl-helm-minikube/install.sh    | 20 +++++-------------
 src/node/install.sh                     | 20 +++++-------------
 src/oryx/install.sh                     | 20 +++++-------------
 src/php/install.sh                      | 24 ++++++---------------
 src/python/install.sh                   | 20 +++++-------------
 src/ruby/install.sh                     | 20 +++++-------------
 src/rust/install.sh                     | 20 +++++-------------
 src/sshd/install.sh                     | 20 +++++-------------
 17 files changed, 90 insertions(+), 262 deletions(-)

diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 6f57a3144..01b7b15ef 100755
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -81,22 +81,12 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
-            USERNAME="${CURRENT_USER}"
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 architecture="$(uname -m)"
 # Normalize arm64 to aarch64 for consistency
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index b0fd2f3b0..481dc3c95 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -399,25 +399,15 @@ case "${ADJUSTED_ID}" in
         ;;
 esac
 
-# If in automatic mode, determine if a user already exists, if not use vscode
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    if [ "${_REMOTE_USER}" != "root" ]; then
-        USERNAME="${_REMOTE_USER}"
-    else
-        USERNAME=""
-        POSSIBLE_USERS=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-        for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-                USERNAME=${CURRENT_USER}
-                break
-            fi
-        done
-        if [ "${USERNAME}" = "" ]; then
-            USERNAME=vscode
-        fi
-    fi
-elif [ "${USERNAME}" = "none" ]; then
-    USERNAME=root
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
+# If in automatic mode, determine if a user already exists, if not use vscode (which will be created)
+USERNAME=$(determine_user_from_input "${USERNAME}" "vscode")
+
+# Handle the special "none" case for common-utils
+if [ "${USERNAME}" = "none" ]; then
     USER_UID=0
     USER_GID=0
 fi
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 43ab82f54..20e4feeac 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -27,22 +27,12 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
-            USERNAME="${CURRENT_USER}"
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 architecture="$(uname -m)"
 if [ "${architecture}" != "x86_64" ]; then
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 4575cc4f9..3f366b354 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -71,22 +71,12 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 # Add default Fluxbox config files if none are already present
 fluxbox_apps="$(cat \
 << 'EOF'
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index 3f30158e5..db365d394 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -44,22 +44,12 @@ fi
 # See: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/shared/utils.sh
 ###################
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 # Package manager update function
 pkg_mgr_update() {
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 74fd63530..034dde234 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -38,22 +38,12 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 apt_get_update()
 {
diff --git a/src/go/install.sh b/src/go/install.sh
index 85fea5dc4..f4628b37e 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -174,22 +174,12 @@ if ! type awk >/dev/null 2>&1; then
     check_packages awk
 fi
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 export DEBIAN_FRONTEND=noninteractive
 
diff --git a/src/hugo/install.sh b/src/hugo/install.sh
index b268e384b..bbfd2bb13 100755
--- a/src/hugo/install.sh
+++ b/src/hugo/install.sh
@@ -29,22 +29,12 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 architecture="$(uname -m)"
 if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "arm64" ] && [ "${architecture}" != "aarch64" ]; then
diff --git a/src/java/install.sh b/src/java/install.sh
index 62fd39462..f1d13d201 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -154,22 +154,12 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 updaterc() {
     local _bashrc
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index f0cf1c946..cbafb18e9 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -28,22 +28,12 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 USERHOME="/home/$USERNAME"
 if [ "$USERNAME" = "root" ]; then
diff --git a/src/node/install.sh b/src/node/install.sh
index 71d91ffe2..e241d47d7 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -247,22 +247,12 @@ if ! type awk >/dev/null 2>&1; then
     check_packages awk
 fi
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index cf67db6b1..b43580b23 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -25,22 +25,12 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 function updaterc() {
     if [ "${UPDATE_RC}" = "true" ]; then
diff --git a/src/php/install.sh b/src/php/install.sh
index 357395e88..4eea3a4ed 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -36,24 +36,12 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
-# If in automatic mode, determine if a user already exists, if not use vscode
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ]; then
-    USERNAME=root
-    USER_UID=0
-    USER_GID=0
-fi
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
+# If in automatic mode, determine if a user already exists, if not use root
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 architecture="$(uname -m)"
 if [ "${architecture}" != "amd64" ] && [ "${architecture}" != "x86_64" ] && [ "${architecture}" != "arm64" ] && [ "${architecture}" != "aarch64" ]; then
diff --git a/src/python/install.sh b/src/python/install.sh
index be895927d..86345bd34 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -835,22 +835,12 @@ if ! type awk >/dev/null 2>&1; then
     check_packages awk
 fi
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 # Ensure apt is in non-interactive to avoid prompts
 export DEBIAN_FRONTEND=noninteractive
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 39cb5be03..87a6d7384 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -39,22 +39,12 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 updaterc() {
     if [ "${UPDATE_RC}" = "true" ]; then
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 99a7ba8f5..54bcd1748 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -101,22 +101,12 @@ rm -f /etc/profile.d/00-restore-env.sh
 echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
 chmod +x /etc/profile.d/00-restore-env.sh
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u "${USERNAME}" > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 # Figure out correct version of a three part version number is not passed
 find_version_from_git_tags() {
diff --git a/src/sshd/install.sh b/src/sshd/install.sh
index 9b9ddedf2..281d095b4 100755
--- a/src/sshd/install.sh
+++ b/src/sshd/install.sh
@@ -25,22 +25,12 @@ if [ "$(id -u)" -ne 0 ]; then
     exit 1
 fi
 
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
 # Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
 
 apt_get_update()
 {

From 79767c0edf4ff1d55d165b60b3c56e1f3abe14b3 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 13:48:10 +0000
Subject: [PATCH 04/16] Update java wrapper.sh to use common-setup.sh helper

---
 src/java/wrapper.sh | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/java/wrapper.sh b/src/java/wrapper.sh
index bea343f96..dcd868955 100644
--- a/src/java/wrapper.sh
+++ b/src/java/wrapper.sh
@@ -24,18 +24,9 @@ if [ "${is_jdk_8}" = "true" ]; then
     jdk_11_folder="$(ls --format=single-column ${SDKMAN_DIR}/candidates/java | grep -oE -m 1 '11\..+')"
     ln -s "${SDKMAN_DIR}/candidates/java/${jdk_11_folder}" /extension-java-home
 
-    # Determine the appropriate non-root user
-    username=""
-    possible_users=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for current_user in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${current_user} > /dev/null 2>&1; then
-            username=${current_user}
-            break
-        fi
-    done
-    if [ "${username}" = "" ]; then
-        username=root
-    fi
+    # Source common helper functions to determine the appropriate non-root user
+    source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../_common/common-setup.sh"
+    username=$(determine_user_from_input "${USERNAME}" "root")
 else
     ln -s ${SDKMAN_DIR}/candidates/java/current /extension-java-home
 fi

From 5c4e3565464486924420cfa7eab9658c0b25d6a1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 13:49:17 +0000
Subject: [PATCH 05/16] Add documentation for _common helper scripts

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/_common/README.md | 122 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 src/_common/README.md

diff --git a/src/_common/README.md b/src/_common/README.md
new file mode 100644
index 000000000..64ea15c66
--- /dev/null
+++ b/src/_common/README.md
@@ -0,0 +1,122 @@
+# Common Helper Scripts
+
+This directory contains common helper scripts that can be shared across multiple features to avoid code duplication.
+
+## common-setup.sh
+
+A helper script that provides common setup functions used across multiple features.
+
+### Functions
+
+#### `determine_user_from_input`
+
+Determines the appropriate non-root user based on the input username.
+
+**Usage:**
+```bash
+# Source the helper script
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
+# Determine the user
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
+```
+
+**Parameters:**
+- `$1` (required): Input username from feature configuration (e.g., "automatic", "auto", "none", or a specific username)
+- `$2` (optional): Fallback username when no user is found in automatic mode (defaults to "root")
+
+**Behavior:**
+- **"auto" or "automatic"**: 
+  - First checks if `_REMOTE_USER` environment variable is set and is not "root"
+  - If `_REMOTE_USER` is root or not set, searches for an existing user from the priority list:
+    1. `devcontainer`
+    2. `vscode`
+    3. `node`
+    4. `codespace`
+    5. User with UID 1000 (from `/etc/passwd`)
+  - If no user is found, returns the fallback user (default: "root")
+  
+- **"none"**: Always returns "root"
+
+- **Specific username**: 
+  - Validates the user exists using `id -u`
+  - If the user exists, returns that username
+  - If the user doesn't exist, returns "root"
+
+**Examples:**
+
+```bash
+# Basic usage with default fallback (root)
+USERNAME=$(determine_user_from_input "automatic")
+
+# With custom fallback
+USERNAME=$(determine_user_from_input "automatic" "vscode")
+
+# Explicit user
+USERNAME=$(determine_user_from_input "myuser")
+
+# None (always returns root)
+USERNAME=$(determine_user_from_input "none")
+```
+
+**Return Value:**
+Prints the resolved username to stdout, which can be captured using command substitution.
+
+## Testing
+
+Tests for the helper scripts are located in `/test/_common/`. Run the tests with:
+
+```bash
+bash test/_common/test-common-setup.sh
+```
+
+## Edge Cases
+
+The helper handles several edge cases:
+
+1. **Missing awk**: Some systems (like Mariner) don't have awk by default. Features should install it before sourcing the helper if needed.
+
+2. **UID 1000 lookup**: The user with UID 1000 is included in the search as it's commonly the first non-system user created.
+
+3. **_REMOTE_USER behavior**: When `_REMOTE_USER` is set to a non-root user, it takes priority over all other detection methods in automatic mode.
+
+4. **Empty user list entries**: The helper safely handles empty entries in the user detection loop.
+
+## Migration Guide
+
+To migrate an existing feature to use the common helper:
+
+### Before:
+```bash
+# Determine the appropriate non-root user
+if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
+    USERNAME=""
+    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            USERNAME=${CURRENT_USER}
+            break
+        fi
+    done
+    if [ "${USERNAME}" = "" ]; then
+        USERNAME=root
+    fi
+elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
+    USERNAME=root
+fi
+```
+
+### After:
+```bash
+# Source common helper functions
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${SCRIPT_DIR}/../_common/common-setup.sh"
+
+# Determine the appropriate non-root user
+USERNAME=$(determine_user_from_input "${USERNAME}" "root")
+```
+
+**Note:** For features like `common-utils` that create users and need a different fallback, use:
+```bash
+USERNAME=$(determine_user_from_input "${USERNAME}" "vscode")
+```

From 964dccffa668fd1e2f24e86e051e3af0550e8c6c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 13:53:02 +0000
Subject: [PATCH 06/16] Fix code review issues: validate _REMOTE_USER, fix
 common-utils none handling, remove dead code

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/_common/common-setup.sh       | 13 +++++++++++--
 src/common-utils/main.sh          | 13 ++++++++-----
 src/java/wrapper.sh               |  4 ----
 test/_common/test-common-setup.sh | 26 ++++++++++++++++++++++----
 4 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/_common/common-setup.sh b/src/_common/common-setup.sh
index 550fd9bed..d2ac866cf 100644
--- a/src/_common/common-setup.sh
+++ b/src/_common/common-setup.sh
@@ -37,8 +37,17 @@ determine_user_from_input() {
         
         # First, check if _REMOTE_USER is set and is not root
         if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
-            resolved_username="${_REMOTE_USER}"
-        else
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
             # Try to find a non-root user from a list of common usernames
             # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
             local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 481dc3c95..eaa4cb512 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -403,13 +403,16 @@ esac
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/../_common/common-setup.sh"
 
-# If in automatic mode, determine if a user already exists, if not use vscode (which will be created)
-USERNAME=$(determine_user_from_input "${USERNAME}" "vscode")
-
-# Handle the special "none" case for common-utils
-if [ "${USERNAME}" = "none" ]; then
+# Handle the special "none" case for common-utils before user determination
+# The "none" case sets USER_UID and USER_GID to 0
+ORIGINAL_USERNAME="${USERNAME}"
+if [ "${ORIGINAL_USERNAME}" = "none" ]; then
+    USERNAME="root"
     USER_UID=0
     USER_GID=0
+else
+    # If in automatic mode, determine if a user already exists, if not use vscode (which will be created)
+    USERNAME=$(determine_user_from_input "${USERNAME}" "vscode")
 fi
 # Create or update a non-root user to match UID/GID.
 group_name="${USERNAME}"
diff --git a/src/java/wrapper.sh b/src/java/wrapper.sh
index dcd868955..202a1856d 100644
--- a/src/java/wrapper.sh
+++ b/src/java/wrapper.sh
@@ -23,10 +23,6 @@ if [ "${is_jdk_8}" = "true" ]; then
     ./install.sh "${ADDITIONAL_JAVA_VERSION}" "${SDKMAN_DIR}" "${USERNAME}" "${UPDATE_RC}"
     jdk_11_folder="$(ls --format=single-column ${SDKMAN_DIR}/candidates/java | grep -oE -m 1 '11\..+')"
     ln -s "${SDKMAN_DIR}/candidates/java/${jdk_11_folder}" /extension-java-home
-
-    # Source common helper functions to determine the appropriate non-root user
-    source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../_common/common-setup.sh"
-    username=$(determine_user_from_input "${USERNAME}" "root")
 else
     ln -s ${SDKMAN_DIR}/candidates/java/current /extension-java-home
 fi
diff --git a/test/_common/test-common-setup.sh b/test/_common/test-common-setup.sh
index e2a5a6dcb..149571e50 100755
--- a/test/_common/test-common-setup.sh
+++ b/test/_common/test-common-setup.sh
@@ -113,14 +113,17 @@ test_remote_user_root() {
 
 # Test 10: Finding vscode user if it exists
 test_find_vscode_user() {
-    # Check if vscode user exists
-    if id -u vscode > /dev/null 2>&1; then
+    # Check if vscode user exists and no higher priority users exist
+    if id -u vscode > /dev/null 2>&1 && \
+       ! id -u devcontainer > /dev/null 2>&1; then
+        # Unset _REMOTE_USER to ensure it doesn't interfere
+        unset _REMOTE_USER
         local result=$(determine_user_from_input "automatic")
         # Should find vscode (it's second in priority after devcontainer)
         run_test "Finds vscode user in automatic mode" "vscode" "${result}"
     else
-        # Skip this test if vscode user doesn't exist
-        run_test "Finds vscode user in automatic mode (SKIPPED - user doesn't exist)" "SKIP" "SKIP"
+        # Skip this test if vscode user doesn't exist or higher priority user exists
+        run_test "Finds vscode user in automatic mode (SKIPPED - conditions not met)" "SKIP" "SKIP"
     fi
 }
 
@@ -128,6 +131,8 @@ test_find_vscode_user() {
 test_find_devcontainer_user() {
     # Check if devcontainer user exists
     if id -u devcontainer > /dev/null 2>&1; then
+        # Unset _REMOTE_USER to ensure it doesn't interfere
+        unset _REMOTE_USER
         local result=$(determine_user_from_input "automatic")
         # Should find devcontainer (highest priority)
         run_test "Finds devcontainer user (highest priority)" "devcontainer" "${result}"
@@ -165,6 +170,18 @@ test_empty_input() {
     run_test "Empty input treated as automatic and finds UID 1000 or uses fallback" "${expected}" "${result}"
 }
 
+# Test 14: _REMOTE_USER set to non-existent user should use fallback
+test_remote_user_nonexistent() {
+    export _REMOTE_USER="nonexistentuser99999"
+    local result=$(determine_user_from_input "automatic" "mydefault")
+    unset _REMOTE_USER
+    
+    # Should fall through to normal detection - find UID 1000 or use fallback
+    local uid_1000_user=$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')
+    local expected="${uid_1000_user:-mydefault}"
+    run_test "_REMOTE_USER set to non-existent user falls back to detection" "${expected}" "${result}"
+}
+
 # Run all tests
 echo "Running tests for common-setup.sh..."
 echo "======================================"
@@ -183,6 +200,7 @@ test_find_vscode_user
 test_find_devcontainer_user
 test_find_uid_1000
 test_empty_input
+test_remote_user_nonexistent
 
 # Print summary
 echo ""

From e6afb13fbd0cf590debd8a4c7d0ea0096b13a38b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 6 Feb 2026 11:40:44 +0000
Subject: [PATCH 07/16] Increment minor version for all 17 features impacted by
 user selection refactor

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/anaconda/devcontainer-feature.json        |  64 +++---
 src/common-utils/devcontainer-feature.json    | 142 ++++++------
 src/conda/devcontainer-feature.json           |  80 +++----
 src/desktop-lite/devcontainer-feature.json    | 132 ++++++------
 .../devcontainer-feature.json                 | 178 +++++++--------
 .../devcontainer-feature.json                 | 152 ++++++-------
 src/go/devcontainer-feature.json              | 102 ++++-----
 src/hugo/devcontainer-feature.json            |   4 +-
 src/java/devcontainer-feature.json            |   4 +-
 .../devcontainer-feature.json                 | 114 +++++-----
 src/node/devcontainer-feature.json            | 152 ++++++-------
 src/oryx/devcontainer-feature.json            |  58 ++---
 src/php/devcontainer-feature.json             |  92 ++++----
 src/python/devcontainer-feature.json          |   4 +-
 src/ruby/devcontainer-feature.json            |  82 +++----
 src/rust/devcontainer-feature.json            | 202 +++++++++---------
 src/sshd/devcontainer-feature.json            |  78 +++----
 17 files changed, 820 insertions(+), 820 deletions(-)

diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json
index ac76a9b99..a8628dfad 100644
--- a/src/anaconda/devcontainer-feature.json
+++ b/src/anaconda/devcontainer-feature.json
@@ -1,34 +1,34 @@
 {
-    "id": "anaconda",
-    "version": "1.1.0",
-    "name": "Anaconda",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest"
-            ],
-            "default": "latest",
-            "description": "Select or enter an anaconda version."
-        }
-    },
-    "containerEnv": {
-        "CONDA_DIR": "/usr/local/conda",
-        "PATH": "/usr/local/conda/bin:${PATH}"
-    },
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes Anaconda and the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
-                    }
-                ]
-            }
-        }
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+  "id": "anaconda",
+  "version": "1.2.0",
+  "name": "Anaconda",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest"
+      ],
+      "default": "latest",
+      "description": "Select or enter an anaconda version."
+    }
+  },
+  "containerEnv": {
+    "CONDA_DIR": "/usr/local/conda",
+    "PATH": "/usr/local/conda/bin:${PATH}"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes Anaconda and the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index 14056e3a9..a1124a981 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,74 +1,74 @@
 {
-    "id": "common-utils",
-    "version": "2.5.6",
-    "name": "Common Utilities",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
-    "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
-    "options": {
-        "installZsh": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install ZSH?"
-        },
-        "configureZshAsDefaultShell": {
-            "type": "boolean",
-            "default": false,
-            "description": "Change default shell to ZSH?"
-        },
-        "installOhMyZsh": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Oh My Zsh!?"
-        },
-        "installOhMyZshConfig": {
-            "type": "boolean",
-            "default": true,
-            "description": "Allow installing the default dev container .zshrc templates?"
-        },
-        "upgradePackages": {
-            "type": "boolean",
-            "default": true,
-            "description": "Upgrade OS packages?"
-        },
-        "username": {
-            "type": "string",
-            "proposals": [
-                "devcontainer",
-                "vscode",
-                "codespace",
-                "none",
-                "automatic"
-            ],
-            "default": "automatic",
-            "description": "Enter name of a non-root user to configure or none to skip"
-        },
-        "userUid": {
-            "type": "string",
-            "proposals": [
-                "1001",
-                "automatic"
-            ],
-            "default": "automatic",
-            "description": "Enter UID for non-root user"
-        },
-        "userGid": {
-            "type": "string",
-            "proposals": [
-                "1001",
-                "automatic"
-            ],
-            "default": "automatic",
-            "description": "Enter GID for non-root user"
-        },
-        "nonFreePackages": {
-            "type": "boolean",
-            "default": false,
-            "description": "Add packages from non-free Debian repository? (Debian only)"
-        },
-        "installSsl": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install SSL?"
-        }
+  "id": "common-utils",
+  "version": "2.6.0",
+  "name": "Common Utilities",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
+  "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
+  "options": {
+    "installZsh": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install ZSH?"
+    },
+    "configureZshAsDefaultShell": {
+      "type": "boolean",
+      "default": false,
+      "description": "Change default shell to ZSH?"
+    },
+    "installOhMyZsh": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Oh My Zsh!?"
+    },
+    "installOhMyZshConfig": {
+      "type": "boolean",
+      "default": true,
+      "description": "Allow installing the default dev container .zshrc templates?"
+    },
+    "upgradePackages": {
+      "type": "boolean",
+      "default": true,
+      "description": "Upgrade OS packages?"
+    },
+    "username": {
+      "type": "string",
+      "proposals": [
+        "devcontainer",
+        "vscode",
+        "codespace",
+        "none",
+        "automatic"
+      ],
+      "default": "automatic",
+      "description": "Enter name of a non-root user to configure or none to skip"
+    },
+    "userUid": {
+      "type": "string",
+      "proposals": [
+        "1001",
+        "automatic"
+      ],
+      "default": "automatic",
+      "description": "Enter UID for non-root user"
+    },
+    "userGid": {
+      "type": "string",
+      "proposals": [
+        "1001",
+        "automatic"
+      ],
+      "default": "automatic",
+      "description": "Enter GID for non-root user"
+    },
+    "nonFreePackages": {
+      "type": "boolean",
+      "default": false,
+      "description": "Add packages from non-free Debian repository? (Debian only)"
+    },
+    "installSsl": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install SSL?"
     }
+  }
 }
diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 163696a20..0764a8c6d 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,43 +1,43 @@
 {
-    "id": "conda",
-    "version": "1.0.10",
-    "name": "Conda",
-    "description": "A cross-platform, language-agnostic binary package manager",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "4.11.0",
-                "4.12.0"
-            ],
-            "default": "latest",
-            "description": "Select or enter a conda version."
-        },
-        "addCondaForge": {
-            "type": "boolean",
-            "default": false,
-            "description": "Add conda-forge channel to the config?"
-        }
+  "id": "conda",
+  "version": "1.1.0",
+  "name": "Conda",
+  "description": "A cross-platform, language-agnostic binary package manager",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "4.11.0",
+        "4.12.0"
+      ],
+      "default": "latest",
+      "description": "Select or enter a conda version."
     },
-    "containerEnv": {
-        "CONDA_DIR": "/opt/conda",
-        "CONDA_SCRIPT":"/opt/conda/etc/profile.d/conda.sh",
-        "PATH": "/opt/conda/bin:${PATH}"
-    },
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
-                    }
-                ]
-            }
-        }
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "addCondaForge": {
+      "type": "boolean",
+      "default": false,
+      "description": "Add conda-forge channel to the config?"
+    }
+  },
+  "containerEnv": {
+    "CONDA_DIR": "/opt/conda",
+    "CONDA_SCRIPT": "/opt/conda/etc/profile.d/conda.sh",
+    "PATH": "/opt/conda/bin:${PATH}"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index ae10c9977..9465d037f 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,71 +1,71 @@
 {
-    "id": "desktop-lite",
-    "version": "1.2.8",
-    "name": "Light-weight Desktop",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
-    "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest"
-            ],
-            "default": "latest",
-            "description": "Currently Unused!"
-        },
-        "noVncVersion": {
-            "type": "string",
-            "proposals": [
-                "1.6.0"
-            ],
-            "default": "1.6.0",
-            "description": "The noVNC version to use"
-        },
-        "password": {
-            "type": "string",
-            "proposals": [
-                "vscode",
-                "codespaces",
-                "password",
-                "noPassword"
-            ],
-            "default": "vscode",
-            "description": "Enter a password for desktop connections. If \"noPassword\", connections from the local host can be established without entering a password"
-        },
-        "webPort": {
-            "type": "string",
-            "proposals": [
-                "6080"
-            ],
-            "default": "6080",
-            "description": "Enter a port for the VNC web client (noVNC)"
-        },
-        "vncPort": {
-            "type": "string",
-            "proposals": [
-                "5901"
-            ],
-            "default": "5901",
-            "description": "Enter a port for the desktop VNC server (TigerVNC)"
-        }
+  "id": "desktop-lite",
+  "version": "1.3.0",
+  "name": "Light-weight Desktop",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
+  "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest"
+      ],
+      "default": "latest",
+      "description": "Currently Unused!"
     },
-    "init": true,
-    "entrypoint": "/usr/local/share/desktop-init.sh",
-    "containerEnv": {
-        "DISPLAY": ":1"
+    "noVncVersion": {
+      "type": "string",
+      "proposals": [
+        "1.6.0"
+      ],
+      "default": "1.6.0",
+      "description": "The noVNC version to use"
     },
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes a lightweight Fluxbox based desktop that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS Code terminal will open on the desktop automatically."
-                    }
-                ]
-            }
-        }
+    "password": {
+      "type": "string",
+      "proposals": [
+        "vscode",
+        "codespaces",
+        "password",
+        "noPassword"
+      ],
+      "default": "vscode",
+      "description": "Enter a password for desktop connections. If \"noPassword\", connections from the local host can be established without entering a password"
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "webPort": {
+      "type": "string",
+      "proposals": [
+        "6080"
+      ],
+      "default": "6080",
+      "description": "Enter a port for the VNC web client (noVNC)"
+    },
+    "vncPort": {
+      "type": "string",
+      "proposals": [
+        "5901"
+      ],
+      "default": "5901",
+      "description": "Enter a port for the desktop VNC server (TigerVNC)"
+    }
+  },
+  "init": true,
+  "entrypoint": "/usr/local/share/desktop-init.sh",
+  "containerEnv": {
+    "DISPLAY": ":1"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes a lightweight Fluxbox based desktop that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS Code terminal will open on the desktop automatically."
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 56520a200..d91d1590e 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,94 +1,94 @@
 {
-    "id": "docker-in-docker",
-    "version": "2.14.0",
-    "name": "Docker (Docker-in-Docker)",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
-    "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "20.10"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
-        },
-        "moby": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install OSS Moby build instead of Docker CE"
-        },
-        "mobyBuildxVersion": {
-            "type": "string",
-            "default": "latest",
-            "description": "Install a specific version of moby-buildx when using Moby"
-        },
-        "dockerDashComposeVersion": {
-            "type": "string",
-            "enum": [
-                "none",
-                "v1",
-                "v2"
-            ],
-            "default": "v2",
-            "description": "Default version of Docker Compose (v1, v2 or none)"
-        },
-        "azureDnsAutoDetection": {
-            "type": "boolean",
-            "default": true,
-            "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
-        },
-        "dockerDefaultAddressPool": {
-            "type": "string",
-            "default": "",
-            "proposals": [],
-            "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
-        },
-        "installDockerBuildx": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Docker Buildx"
-        },
-        "installDockerComposeSwitch": {
-            "type": "boolean",
-            "default": false,
-            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-        },
-        "disableIp6tables": {
-            "type": "boolean",
-            "default": false,
-            "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
-        }
+  "id": "docker-in-docker",
+  "version": "2.15.0",
+  "name": "Docker (Docker-in-Docker)",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
+  "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "20.10"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
     },
-    "entrypoint": "/usr/local/share/docker-init.sh",
-    "privileged": true,
-    "containerEnv": {
-        "DOCKER_BUILDKIT": "1"
+    "moby": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install OSS Moby build instead of Docker CE"
     },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-azuretools.vscode-containers"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
-                    }
-                ]
-            }
-        }
+    "mobyBuildxVersion": {
+      "type": "string",
+      "default": "latest",
+      "description": "Install a specific version of moby-buildx when using Moby"
     },
-    "mounts": [
-        {
-            "source": "dind-var-lib-docker-${devcontainerId}",
-            "target": "/var/lib/docker",
-            "type": "volume"
-        }
-    ],
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "dockerDashComposeVersion": {
+      "type": "string",
+      "enum": [
+        "none",
+        "v1",
+        "v2"
+      ],
+      "default": "v2",
+      "description": "Default version of Docker Compose (v1, v2 or none)"
+    },
+    "azureDnsAutoDetection": {
+      "type": "boolean",
+      "default": true,
+      "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
+    },
+    "dockerDefaultAddressPool": {
+      "type": "string",
+      "default": "",
+      "proposals": [],
+      "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
+    },
+    "installDockerBuildx": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Docker Buildx"
+    },
+    "installDockerComposeSwitch": {
+      "type": "boolean",
+      "default": false,
+      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+    },
+    "disableIp6tables": {
+      "type": "boolean",
+      "default": false,
+      "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
+    }
+  },
+  "entrypoint": "/usr/local/share/docker-init.sh",
+  "privileged": true,
+  "containerEnv": {
+    "DOCKER_BUILDKIT": "1"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azuretools.vscode-containers"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
+          }
+        ]
+      }
+    }
+  },
+  "mounts": [
+    {
+      "source": "dind-var-lib-docker-${devcontainerId}",
+      "target": "/var/lib/docker",
+      "type": "volume"
+    }
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 7314fa83d..34d464cf5 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,80 +1,80 @@
 {
-    "id": "docker-outside-of-docker",
-    "version": "1.6.5",
-    "name": "Docker (docker-outside-of-docker)",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
-    "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "20.10"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
-        },
-        "moby": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install OSS Moby build instead of Docker CE"
-        },
-        "mobyBuildxVersion": {
-            "type": "string",
-            "default": "latest",
-            "description": "Install a specific version of moby-buildx when using Moby"
-        },
-        "dockerDashComposeVersion": {
-            "type": "string",
-            "enum": [
-                "none",
-                "v1",
-                "v2"
-            ],
-            "default": "v2",
-            "description": "Compose version to use for docker-compose (v1 or v2 or none)"
-        },
-        "installDockerBuildx": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Docker Buildx"
-        },
-        "installDockerComposeSwitch": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-        }
+  "id": "docker-outside-of-docker",
+  "version": "1.7.0",
+  "name": "Docker (docker-outside-of-docker)",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
+  "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "20.10"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
     },
-    "entrypoint": "/usr/local/share/docker-init.sh",
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-azuretools.vscode-containers"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
-                    }
-                ]
-            }
-        }
+    "moby": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install OSS Moby build instead of Docker CE"
     },
-    "mounts": [
-        {
-            "source": "/var/run/docker.sock",
-            "target": "/var/run/docker-host.sock",
-            "type": "bind"
-        }
-    ],
-    "securityOpt": [
-        "label=disable"
-    ],
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ],
-    "legacyIds": [
-        "docker-from-docker"
-    ]
+    "mobyBuildxVersion": {
+      "type": "string",
+      "default": "latest",
+      "description": "Install a specific version of moby-buildx when using Moby"
+    },
+    "dockerDashComposeVersion": {
+      "type": "string",
+      "enum": [
+        "none",
+        "v1",
+        "v2"
+      ],
+      "default": "v2",
+      "description": "Compose version to use for docker-compose (v1 or v2 or none)"
+    },
+    "installDockerBuildx": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Docker Buildx"
+    },
+    "installDockerComposeSwitch": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+    }
+  },
+  "entrypoint": "/usr/local/share/docker-init.sh",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azuretools.vscode-containers"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
+          }
+        ]
+      }
+    }
+  },
+  "mounts": [
+    {
+      "source": "/var/run/docker.sock",
+      "target": "/var/run/docker-host.sock",
+      "type": "bind"
+    }
+  ],
+  "securityOpt": [
+    "label=disable"
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ],
+  "legacyIds": [
+    "docker-from-docker"
+  ]
 }
diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index f98e65a7f..81f0dd090 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,54 +1,54 @@
 {
-    "id": "go",
-    "version": "1.3.2",
-    "name": "Go",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
-    "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "1.24",
-                "1.23"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Go version to install"
-        },
-        "golangciLintVersion": {
-            "type": "string",
-            "default": "latest",
-            "description": "Version of golangci-lint to install"
-        }
+  "id": "go",
+  "version": "1.4.0",
+  "name": "Go",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
+  "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "1.24",
+        "1.23"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Go version to install"
     },
-    "init": true,
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "golang.Go"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes Go and common Go utilities pre-installed and available on the `PATH`, along with the Go language extension for Go development."
-                    }
-                ]
-            }
-        }
-    },
-    "containerEnv": {
-        "GOROOT": "/usr/local/go",
-        "GOPATH": "/go",
-        "PATH": "/usr/local/go/bin:/go/bin:${PATH}"
-    },
-    "capAdd": [
-        "SYS_PTRACE"
-    ],
-    "securityOpt": [
-        "seccomp=unconfined"
-    ],
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "golangciLintVersion": {
+      "type": "string",
+      "default": "latest",
+      "description": "Version of golangci-lint to install"
+    }
+  },
+  "init": true,
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "golang.Go"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes Go and common Go utilities pre-installed and available on the `PATH`, along with the Go language extension for Go development."
+          }
+        ]
+      }
+    }
+  },
+  "containerEnv": {
+    "GOROOT": "/usr/local/go",
+    "GOPATH": "/go",
+    "PATH": "/usr/local/go/bin:/go/bin:${PATH}"
+  },
+  "capAdd": [
+    "SYS_PTRACE"
+  ],
+  "securityOpt": [
+    "seccomp=unconfined"
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/hugo/devcontainer-feature.json b/src/hugo/devcontainer-feature.json
index 376826509..342bb1ef0 100644
--- a/src/hugo/devcontainer-feature.json
+++ b/src/hugo/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "hugo",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "name": "Hugo",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/hugo",
   "options": {
@@ -34,6 +34,6 @@
     }
   },
   "installsAfter": [
-      "ghcr.io/devcontainers/features/common-utils"
+    "ghcr.io/devcontainers/features/common-utils"
   ]
 }
diff --git a/src/java/devcontainer-feature.json b/src/java/devcontainer-feature.json
index 4198af326..c50bc15a2 100644
--- a/src/java/devcontainer-feature.json
+++ b/src/java/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "java",
-  "version": "1.6.3",
+  "version": "1.7.0",
   "name": "Java (via SDKMAN!)",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/java",
   "description": "Installs Java, SDKMAN! (if not installed), and needed dependencies.",
@@ -122,4 +122,4 @@
   "installsAfter": [
     "ghcr.io/devcontainers/features/common-utils"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 410a909e4..78f05427d 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,61 +1,61 @@
 {
-    "id": "kubectl-helm-minikube",
-    "version": "1.2.2",
-    "name": "Kubectl, Helm, and Minikube",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
-    "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "1.23",
-                "1.22",
-                "1.21",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Kubernetes version to install"
-        },
-        "helm": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Helm version to install"
-        },
-        "minikube": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Minikube version to install"
-        }
+  "id": "kubectl-helm-minikube",
+  "version": "1.3.0",
+  "name": "Kubectl, Helm, and Minikube",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
+  "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "1.23",
+        "1.22",
+        "1.21",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Kubernetes version to install"
     },
-    "mounts": [
-        {
-            "source": "minikube-config",
-            "target": "/home/vscode/.minikube",
-            "type": "volume"
-        }
-    ],
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
-                    }
-                ]
-            }
-        }
+    "helm": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Helm version to install"
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "minikube": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Minikube version to install"
+    }
+  },
+  "mounts": [
+    {
+      "source": "minikube-config",
+      "target": "/home/vscode/.minikube",
+      "type": "volume"
+    }
+  ],
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index c8ceb966f..dd7227613 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,81 +1,81 @@
 {
-    "id": "node",
-    "version": "1.7.1",
-    "name": "Node.js (via nvm), yarn and pnpm.",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
-    "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "lts",
-                "latest",
-                "none",
-                "22",
-                "20"
-            ],
-            "default": "lts",
-            "description": "Select or enter a Node.js version to install"
-        },
-        "nodeGypDependencies": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install dependencies to compile native node modules (node-gyp)?"
-        },
-        "nvmInstallPath": {
-            "type": "string",
-            "default": "/usr/local/share/nvm",
-            "description": "The path where NVM will be installed."
-        },
-        "pnpmVersion": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "8.8.0",
-                "8.0.0",
-                "7.30.0",
-                "6.14.8",
-                "5.18.10",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter the PNPM version to install"
-        },
-        "nvmVersion": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "0.39"
-            ],
-            "default": "latest",
-            "description": "Version of NVM to install."
-        },
-        "installYarnUsingApt": {
-            "type": "boolean",
-            "default": false,
-            "description": "On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs."
-        }
+  "id": "node",
+  "version": "1.8.0",
+  "name": "Node.js (via nvm), yarn and pnpm.",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
+  "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "lts",
+        "latest",
+        "none",
+        "22",
+        "20"
+      ],
+      "default": "lts",
+      "description": "Select or enter a Node.js version to install"
     },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "dbaeumer.vscode-eslint"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes `node`, `npm` and `eslint` pre-installed and available on the `PATH` for Node.js and JavaScript development."
-                    }
-                ]
-            }
-        }
+    "nodeGypDependencies": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install dependencies to compile native node modules (node-gyp)?"
     },
-    "containerEnv": {
-        "NVM_DIR": "/usr/local/share/nvm",
-        "NVM_SYMLINK_CURRENT": "true",
-        "PATH": "/usr/local/share/nvm/current/bin:${PATH}"
+    "nvmInstallPath": {
+      "type": "string",
+      "default": "/usr/local/share/nvm",
+      "description": "The path where NVM will be installed."
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "pnpmVersion": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "8.8.0",
+        "8.0.0",
+        "7.30.0",
+        "6.14.8",
+        "5.18.10",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter the PNPM version to install"
+    },
+    "nvmVersion": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "0.39"
+      ],
+      "default": "latest",
+      "description": "Version of NVM to install."
+    },
+    "installYarnUsingApt": {
+      "type": "boolean",
+      "default": false,
+      "description": "On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs."
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes `node`, `npm` and `eslint` pre-installed and available on the `PATH` for Node.js and JavaScript development."
+          }
+        ]
+      }
+    }
+  },
+  "containerEnv": {
+    "NVM_DIR": "/usr/local/share/nvm",
+    "NVM_SYMLINK_CURRENT": "true",
+    "PATH": "/usr/local/share/nvm/current/bin:${PATH}"
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 860a39003..28ac31f93 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,31 +1,31 @@
 {
-    "id": "oryx",
-    "version": "1.4.1",
-    "name": "Oryx",
-    "description": "Installs the oryx CLI",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
-    "containerEnv": {
-        "ORYX_SDK_STORAGE_BASE_URL": "https://oryx-cdn.microsoft.io",
-        "ENABLE_DYNAMIC_INSTALL": "true",
-        "DYNAMIC_INSTALL_ROOT_DIR": "/opt",
-        "ORYX_PREFER_USER_INSTALLED_SDKS": "true",
-        "ORYX_DIR": "/usr/local/oryx",
-        "DEBIAN_FLAVOR": "focal-scm",
-        "PATH": "/usr/local/oryx:${PATH}"
-    },
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the oryx CLI pre-installed and available on the `PATH`."
-                    }
-                ]
-            }
-        }
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils",
-        "ghcr.io/devcontainers/features/dotnet"
-    ]
+  "id": "oryx",
+  "version": "1.5.0",
+  "name": "Oryx",
+  "description": "Installs the oryx CLI",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
+  "containerEnv": {
+    "ORYX_SDK_STORAGE_BASE_URL": "https://oryx-cdn.microsoft.io",
+    "ENABLE_DYNAMIC_INSTALL": "true",
+    "DYNAMIC_INSTALL_ROOT_DIR": "/opt",
+    "ORYX_PREFER_USER_INSTALLED_SDKS": "true",
+    "ORYX_DIR": "/usr/local/oryx",
+    "DEBIAN_FLAVOR": "focal-scm",
+    "PATH": "/usr/local/oryx:${PATH}"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the oryx CLI pre-installed and available on the `PATH`."
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils",
+    "ghcr.io/devcontainers/features/dotnet"
+  ]
 }
diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index 4db478230..5cdb87747 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,49 +1,49 @@
 {
-    "id": "php",
-    "version": "1.1.4",
-    "name": "PHP",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "8",
-                "8.2",
-                "8.2.0",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a PHP version"
-        },
-        "installComposer": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install PHP Composer?"
-        }
+  "id": "php",
+  "version": "1.2.0",
+  "name": "PHP",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "8",
+        "8.2",
+        "8.2.0",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a PHP version"
     },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "xdebug.php-debug",
-                "bmewburn.vscode-intelephense-client",
-                "xdebug.php-pack",
-                "devsense.phptools-vscode"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes PHP pre-installed and available on the `PATH`, along with PHP language extensions for PHP development."
-                    }
-                ]
-            }
-        }
-    },
-    "containerEnv": {
-        "PHP_PATH": "/usr/local/php/current",
-        "PATH": "/usr/local/php/current/bin:${PATH}"
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "installComposer": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install PHP Composer?"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "xdebug.php-debug",
+        "bmewburn.vscode-intelephense-client",
+        "xdebug.php-pack",
+        "devsense.phptools-vscode"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes PHP pre-installed and available on the `PATH`, along with PHP language extensions for PHP development."
+          }
+        ]
+      }
+    }
+  },
+  "containerEnv": {
+    "PHP_PATH": "/usr/local/php/current",
+    "PATH": "/usr/local/php/current/bin:${PATH}"
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/python/devcontainer-feature.json b/src/python/devcontainer-feature.json
index 6a4121415..d8113df03 100644
--- a/src/python/devcontainer-feature.json
+++ b/src/python/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "python",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "name": "Python",
   "documentationURL": "https://github.com/devcontainers/features/tree/main/src/python",
   "description": "Installs the provided version of Python, as well as PIPX, and other common Python utilities.  JupyterLab is conditionally installed with the python feature. Note: May require source code compilation.",
@@ -93,4 +93,4 @@
     "ghcr.io/devcontainers/features/common-utils",
     "ghcr.io/devcontainers/features/oryx"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 661c46bf0..466c994f4 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,43 +1,43 @@
 {
-    "id": "ruby",
-    "version": "1.3.2",
-    "name": "Ruby (via rvm)",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
-    "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "3.4",
-                "3.2"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Ruby version to install"
-        }
-    },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "shopify.ruby-lsp"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Ruby language extension for Ruby development."
-                    }
-                ]
-            }
-        }
-    },
-    "containerEnv": {
-        "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global",
-        "GEM_HOME": "/usr/local/rvm/gems/default",
-        "MY_RUBY_HOME": "/usr/local/rvm/rubies/default",
-        "PATH": "/usr/local/rvm/gems/default/bin:/usr/local/rvm/gems/default@global/bin:/usr/local/rvm/rubies/default/bin:/usr/local/share/rbenv/bin:${PATH}"
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+  "id": "ruby",
+  "version": "1.4.0",
+  "name": "Ruby (via rvm)",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
+  "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "3.4",
+        "3.2"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Ruby version to install"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "shopify.ruby-lsp"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Ruby language extension for Ruby development."
+          }
+        ]
+      }
+    }
+  },
+  "containerEnv": {
+    "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global",
+    "GEM_HOME": "/usr/local/rvm/gems/default",
+    "MY_RUBY_HOME": "/usr/local/rvm/rubies/default",
+    "PATH": "/usr/local/rvm/gems/default/bin:/usr/local/rvm/gems/default@global/bin:/usr/local/rvm/rubies/default/bin:/usr/local/share/rbenv/bin:${PATH}"
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 88b64daed..235879c9a 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,106 +1,106 @@
 {
-    "id": "rust",
-    "version": "1.5.0",
-    "name": "Rust",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
-    "description": "Installs Rust, common Rust utilities, and their required dependencies",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "1.87",
-                "1.86",
-                "1.85",
-                "1.84",
-                "1.83",
-                "1.82",
-                "1.81",
-                "1.80",
-                "1.79",
-                "1.78",
-                "1.77",
-                "1.76",
-                "1.75",
-                "1.74",
-                "1.73",
-                "1.72",
-                "1.71",
-                "1.70",
-                "1.69",
-                "1.68",
-                "1.67",
-                "1.66",
-                "1.65",
-                "1.64"
-            ],
-            "default": "latest",
-            "description": "Select or enter a version of Rust to install."
-        },
-        "profile": {
-            "type": "string",
-            "proposals": [
-                "minimal",
-                "default",
-                "complete"
-            ],
-            "default": "minimal",
-            "description": "Select a rustup install profile."
-        },
-        "targets": {
-            "type": "string",
-            "default": "",
-            "description": "Optional comma separated list of additional Rust targets to install.",
-            "proposals": [
-                "aarch64-unknown-linux-gnu",
-                "armv7-unknown-linux-gnueabihf",
-                "x86_64-unknown-redox,x86_64-unknown-uefi"
-            ]
-        },
-        "components": {
-            "type": "string",
-            "default": "rust-analyzer,rust-src,rustfmt,clippy",
-            "description": "Optional, comma separated list of Rust components to be installed",
-            "proposals": [
-                "rust-analyzer,rust-src,rustfmt,clippy",
-                "rust-analyzer,rust-src",
-                "rustfmt,clippy,rust-docs",
-                "llvm-tools-preview,rust-src,rustfmt"
-            ]
-        }        
+  "id": "rust",
+  "version": "1.6.0",
+  "name": "Rust",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
+  "description": "Installs Rust, common Rust utilities, and their required dependencies",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "1.87",
+        "1.86",
+        "1.85",
+        "1.84",
+        "1.83",
+        "1.82",
+        "1.81",
+        "1.80",
+        "1.79",
+        "1.78",
+        "1.77",
+        "1.76",
+        "1.75",
+        "1.74",
+        "1.73",
+        "1.72",
+        "1.71",
+        "1.70",
+        "1.69",
+        "1.68",
+        "1.67",
+        "1.66",
+        "1.65",
+        "1.64"
+      ],
+      "default": "latest",
+      "description": "Select or enter a version of Rust to install."
     },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "vadimcn.vscode-lldb",
-                "rust-lang.rust-analyzer",
-                "tamasfe.even-better-toml"
-            ],
-            "settings": {
-                "files.watcherExclude": {
-                    "**/target/**": true
-                },
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes Rust, common Rust utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Rust language extension for Rust development."
-                    }
-                ]
-            }
-        }
+    "profile": {
+      "type": "string",
+      "proposals": [
+        "minimal",
+        "default",
+        "complete"
+      ],
+      "default": "minimal",
+      "description": "Select a rustup install profile."
     },
-    "containerEnv": {
-        "CARGO_HOME": "/usr/local/cargo",
-        "RUSTUP_HOME": "/usr/local/rustup",
-        "PATH": "/usr/local/cargo/bin:${PATH}"
+    "targets": {
+      "type": "string",
+      "default": "",
+      "description": "Optional comma separated list of additional Rust targets to install.",
+      "proposals": [
+        "aarch64-unknown-linux-gnu",
+        "armv7-unknown-linux-gnueabihf",
+        "x86_64-unknown-redox,x86_64-unknown-uefi"
+      ]
     },
-    "capAdd": [
-        "SYS_PTRACE"
-    ],
-    "securityOpt": [
-        "seccomp=unconfined"
-    ],
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "components": {
+      "type": "string",
+      "default": "rust-analyzer,rust-src,rustfmt,clippy",
+      "description": "Optional, comma separated list of Rust components to be installed",
+      "proposals": [
+        "rust-analyzer,rust-src,rustfmt,clippy",
+        "rust-analyzer,rust-src",
+        "rustfmt,clippy,rust-docs",
+        "llvm-tools-preview,rust-src,rustfmt"
+      ]
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "vadimcn.vscode-lldb",
+        "rust-lang.rust-analyzer",
+        "tamasfe.even-better-toml"
+      ],
+      "settings": {
+        "files.watcherExclude": {
+          "**/target/**": true
+        },
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes Rust, common Rust utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Rust language extension for Rust development."
+          }
+        ]
+      }
+    }
+  },
+  "containerEnv": {
+    "CARGO_HOME": "/usr/local/cargo",
+    "RUSTUP_HOME": "/usr/local/rustup",
+    "PATH": "/usr/local/cargo/bin:${PATH}"
+  },
+  "capAdd": [
+    "SYS_PTRACE"
+  ],
+  "securityOpt": [
+    "seccomp=unconfined"
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json
index 46c4ef302..eb8c82909 100644
--- a/src/sshd/devcontainer-feature.json
+++ b/src/sshd/devcontainer-feature.json
@@ -1,42 +1,42 @@
 {
-    "id": "sshd",
-    "version": "1.1.0",
-    "name": "SSH server",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
-    "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest"
-            ],
-            "default": "latest",
-            "description": "Currently unused."
-        },
-        "gatewayPorts": {
-            "type": "string",
-            "enum": [
-                "no",
-                "yes",
-                "clientspecified"
-            ],
-            "default": "no",
-            "description": "Enable other hosts in the same network to connect to the forwarded ports"
-        }
+  "id": "sshd",
+  "version": "1.2.0",
+  "name": "SSH server",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
+  "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest"
+      ],
+      "default": "latest",
+      "description": "Currently unused."
     },
-    "entrypoint": "/usr/local/share/ssh-init.sh",
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes an SSH server so that you can use an external terminal, sftp, or SSHFS to interact with it. The first time you've started the container, you will want to set a password for your user. With each connection to the container, you'll want to forward the SSH port to your local machine and use a local terminal or other tool to connect using the password you set."
-                    }
-                ]
-            }
-        }
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "gatewayPorts": {
+      "type": "string",
+      "enum": [
+        "no",
+        "yes",
+        "clientspecified"
+      ],
+      "default": "no",
+      "description": "Enable other hosts in the same network to connect to the forwarded ports"
+    }
+  },
+  "entrypoint": "/usr/local/share/ssh-init.sh",
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes an SSH server so that you can use an external terminal, sftp, or SSHFS to interact with it. The first time you've started the container, you will want to set a password for your user. With each connection to the container, you'll want to forward the SSH port to your local machine and use a local terminal or other tool to connect using the password you set."
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }

From 997feb309355634d82503ba886ab198f88c94419 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 6 Feb 2026 13:06:41 +0000
Subject: [PATCH 08/16] Fix JSON indentation to preserve original formatting

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/anaconda/devcontainer-feature.json        |  64 +++---
 src/common-utils/devcontainer-feature.json    | 142 ++++++------
 src/conda/devcontainer-feature.json           |  80 +++----
 src/desktop-lite/devcontainer-feature.json    | 132 ++++++------
 .../devcontainer-feature.json                 | 178 +++++++--------
 .../devcontainer-feature.json                 | 152 ++++++-------
 src/go/devcontainer-feature.json              | 102 ++++-----
 .../devcontainer-feature.json                 | 114 +++++-----
 src/node/devcontainer-feature.json            | 152 ++++++-------
 src/oryx/devcontainer-feature.json            |  58 ++---
 src/php/devcontainer-feature.json             |  92 ++++----
 src/ruby/devcontainer-feature.json            |  82 +++----
 src/rust/devcontainer-feature.json            | 202 +++++++++---------
 src/sshd/devcontainer-feature.json            |  78 +++----
 14 files changed, 814 insertions(+), 814 deletions(-)

diff --git a/src/anaconda/devcontainer-feature.json b/src/anaconda/devcontainer-feature.json
index a8628dfad..5b714c74c 100644
--- a/src/anaconda/devcontainer-feature.json
+++ b/src/anaconda/devcontainer-feature.json
@@ -1,34 +1,34 @@
 {
-  "id": "anaconda",
-  "version": "1.2.0",
-  "name": "Anaconda",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest"
-      ],
-      "default": "latest",
-      "description": "Select or enter an anaconda version."
-    }
-  },
-  "containerEnv": {
-    "CONDA_DIR": "/usr/local/conda",
-    "PATH": "/usr/local/conda/bin:${PATH}"
-  },
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes Anaconda and the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
-          }
-        ]
-      }
-    }
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "id": "anaconda",
+    "version": "1.2.0",
+    "name": "Anaconda",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest"
+            ],
+            "default": "latest",
+            "description": "Select or enter an anaconda version."
+        }
+    },
+    "containerEnv": {
+        "CONDA_DIR": "/usr/local/conda",
+        "PATH": "/usr/local/conda/bin:${PATH}"
+    },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Anaconda and the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
+                    }
+                ]
+            }
+        }
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
index a1124a981..712f2b3ca 100644
--- a/src/common-utils/devcontainer-feature.json
+++ b/src/common-utils/devcontainer-feature.json
@@ -1,74 +1,74 @@
 {
-  "id": "common-utils",
-  "version": "2.6.0",
-  "name": "Common Utilities",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
-  "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
-  "options": {
-    "installZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install ZSH?"
-    },
-    "configureZshAsDefaultShell": {
-      "type": "boolean",
-      "default": false,
-      "description": "Change default shell to ZSH?"
-    },
-    "installOhMyZsh": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install Oh My Zsh!?"
-    },
-    "installOhMyZshConfig": {
-      "type": "boolean",
-      "default": true,
-      "description": "Allow installing the default dev container .zshrc templates?"
-    },
-    "upgradePackages": {
-      "type": "boolean",
-      "default": true,
-      "description": "Upgrade OS packages?"
-    },
-    "username": {
-      "type": "string",
-      "proposals": [
-        "devcontainer",
-        "vscode",
-        "codespace",
-        "none",
-        "automatic"
-      ],
-      "default": "automatic",
-      "description": "Enter name of a non-root user to configure or none to skip"
-    },
-    "userUid": {
-      "type": "string",
-      "proposals": [
-        "1001",
-        "automatic"
-      ],
-      "default": "automatic",
-      "description": "Enter UID for non-root user"
-    },
-    "userGid": {
-      "type": "string",
-      "proposals": [
-        "1001",
-        "automatic"
-      ],
-      "default": "automatic",
-      "description": "Enter GID for non-root user"
-    },
-    "nonFreePackages": {
-      "type": "boolean",
-      "default": false,
-      "description": "Add packages from non-free Debian repository? (Debian only)"
-    },
-    "installSsl": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install SSL?"
+    "id": "common-utils",
+    "version": "2.6.0",
+    "name": "Common Utilities",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
+    "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
+    "options": {
+        "installZsh": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install ZSH?"
+        },
+        "configureZshAsDefaultShell": {
+            "type": "boolean",
+            "default": false,
+            "description": "Change default shell to ZSH?"
+        },
+        "installOhMyZsh": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Oh My Zsh!?"
+        },
+        "installOhMyZshConfig": {
+            "type": "boolean",
+            "default": true,
+            "description": "Allow installing the default dev container .zshrc templates?"
+        },
+        "upgradePackages": {
+            "type": "boolean",
+            "default": true,
+            "description": "Upgrade OS packages?"
+        },
+        "username": {
+            "type": "string",
+            "proposals": [
+                "devcontainer",
+                "vscode",
+                "codespace",
+                "none",
+                "automatic"
+            ],
+            "default": "automatic",
+            "description": "Enter name of a non-root user to configure or none to skip"
+        },
+        "userUid": {
+            "type": "string",
+            "proposals": [
+                "1001",
+                "automatic"
+            ],
+            "default": "automatic",
+            "description": "Enter UID for non-root user"
+        },
+        "userGid": {
+            "type": "string",
+            "proposals": [
+                "1001",
+                "automatic"
+            ],
+            "default": "automatic",
+            "description": "Enter GID for non-root user"
+        },
+        "nonFreePackages": {
+            "type": "boolean",
+            "default": false,
+            "description": "Add packages from non-free Debian repository? (Debian only)"
+        },
+        "installSsl": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install SSL?"
+        }
     }
-  }
 }
diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 0764a8c6d..39615464d 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,43 +1,43 @@
 {
-  "id": "conda",
-  "version": "1.1.0",
-  "name": "Conda",
-  "description": "A cross-platform, language-agnostic binary package manager",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "4.11.0",
-        "4.12.0"
-      ],
-      "default": "latest",
-      "description": "Select or enter a conda version."
+    "id": "conda",
+    "version": "1.1.0",
+    "name": "Conda",
+    "description": "A cross-platform, language-agnostic binary package manager",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "4.11.0",
+                "4.12.0"
+            ],
+            "default": "latest",
+            "description": "Select or enter a conda version."
+        },
+        "addCondaForge": {
+            "type": "boolean",
+            "default": false,
+            "description": "Add conda-forge channel to the config?"
+        }
     },
-    "addCondaForge": {
-      "type": "boolean",
-      "default": false,
-      "description": "Add conda-forge channel to the config?"
-    }
-  },
-  "containerEnv": {
-    "CONDA_DIR": "/opt/conda",
-    "CONDA_SCRIPT": "/opt/conda/etc/profile.d/conda.sh",
-    "PATH": "/opt/conda/bin:${PATH}"
-  },
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
-          }
-        ]
-      }
-    }
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "containerEnv": {
+        "CONDA_DIR": "/opt/conda",
+        "CONDA_SCRIPT": "/opt/conda/etc/profile.d/conda.sh",
+        "PATH": "/opt/conda/bin:${PATH}"
+    },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
+                    }
+                ]
+            }
+        }
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/desktop-lite/devcontainer-feature.json b/src/desktop-lite/devcontainer-feature.json
index 9465d037f..aa2a6c68f 100644
--- a/src/desktop-lite/devcontainer-feature.json
+++ b/src/desktop-lite/devcontainer-feature.json
@@ -1,71 +1,71 @@
 {
-  "id": "desktop-lite",
-  "version": "1.3.0",
-  "name": "Light-weight Desktop",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
-  "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest"
-      ],
-      "default": "latest",
-      "description": "Currently Unused!"
+    "id": "desktop-lite",
+    "version": "1.3.0",
+    "name": "Light-weight Desktop",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
+    "description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest"
+            ],
+            "default": "latest",
+            "description": "Currently Unused!"
+        },
+        "noVncVersion": {
+            "type": "string",
+            "proposals": [
+                "1.6.0"
+            ],
+            "default": "1.6.0",
+            "description": "The noVNC version to use"
+        },
+        "password": {
+            "type": "string",
+            "proposals": [
+                "vscode",
+                "codespaces",
+                "password",
+                "noPassword"
+            ],
+            "default": "vscode",
+            "description": "Enter a password for desktop connections. If \"noPassword\", connections from the local host can be established without entering a password"
+        },
+        "webPort": {
+            "type": "string",
+            "proposals": [
+                "6080"
+            ],
+            "default": "6080",
+            "description": "Enter a port for the VNC web client (noVNC)"
+        },
+        "vncPort": {
+            "type": "string",
+            "proposals": [
+                "5901"
+            ],
+            "default": "5901",
+            "description": "Enter a port for the desktop VNC server (TigerVNC)"
+        }
     },
-    "noVncVersion": {
-      "type": "string",
-      "proposals": [
-        "1.6.0"
-      ],
-      "default": "1.6.0",
-      "description": "The noVNC version to use"
+    "init": true,
+    "entrypoint": "/usr/local/share/desktop-init.sh",
+    "containerEnv": {
+        "DISPLAY": ":1"
     },
-    "password": {
-      "type": "string",
-      "proposals": [
-        "vscode",
-        "codespaces",
-        "password",
-        "noPassword"
-      ],
-      "default": "vscode",
-      "description": "Enter a password for desktop connections. If \"noPassword\", connections from the local host can be established without entering a password"
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes a lightweight Fluxbox based desktop that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS Code terminal will open on the desktop automatically."
+                    }
+                ]
+            }
+        }
     },
-    "webPort": {
-      "type": "string",
-      "proposals": [
-        "6080"
-      ],
-      "default": "6080",
-      "description": "Enter a port for the VNC web client (noVNC)"
-    },
-    "vncPort": {
-      "type": "string",
-      "proposals": [
-        "5901"
-      ],
-      "default": "5901",
-      "description": "Enter a port for the desktop VNC server (TigerVNC)"
-    }
-  },
-  "init": true,
-  "entrypoint": "/usr/local/share/desktop-init.sh",
-  "containerEnv": {
-    "DISPLAY": ":1"
-  },
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes a lightweight Fluxbox based desktop that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS Code terminal will open on the desktop automatically."
-          }
-        ]
-      }
-    }
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index d91d1590e..0cd4f1458 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,94 +1,94 @@
 {
-  "id": "docker-in-docker",
-  "version": "2.15.0",
-  "name": "Docker (Docker-in-Docker)",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
-  "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none",
-        "20.10"
-      ],
-      "default": "latest",
-      "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
+    "id": "docker-in-docker",
+    "version": "2.15.0",
+    "name": "Docker (Docker-in-Docker)",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
+    "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "20.10"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
+        },
+        "moby": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install OSS Moby build instead of Docker CE"
+        },
+        "mobyBuildxVersion": {
+            "type": "string",
+            "default": "latest",
+            "description": "Install a specific version of moby-buildx when using Moby"
+        },
+        "dockerDashComposeVersion": {
+            "type": "string",
+            "enum": [
+                "none",
+                "v1",
+                "v2"
+            ],
+            "default": "v2",
+            "description": "Default version of Docker Compose (v1, v2 or none)"
+        },
+        "azureDnsAutoDetection": {
+            "type": "boolean",
+            "default": true,
+            "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
+        },
+        "dockerDefaultAddressPool": {
+            "type": "string",
+            "default": "",
+            "proposals": [],
+            "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
+        },
+        "installDockerBuildx": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Docker Buildx"
+        },
+        "installDockerComposeSwitch": {
+            "type": "boolean",
+            "default": false,
+            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+        },
+        "disableIp6tables": {
+            "type": "boolean",
+            "default": false,
+            "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
+        }
     },
-    "moby": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install OSS Moby build instead of Docker CE"
+    "entrypoint": "/usr/local/share/docker-init.sh",
+    "privileged": true,
+    "containerEnv": {
+        "DOCKER_BUILDKIT": "1"
     },
-    "mobyBuildxVersion": {
-      "type": "string",
-      "default": "latest",
-      "description": "Install a specific version of moby-buildx when using Moby"
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-azuretools.vscode-containers"
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
+                    }
+                ]
+            }
+        }
     },
-    "dockerDashComposeVersion": {
-      "type": "string",
-      "enum": [
-        "none",
-        "v1",
-        "v2"
-      ],
-      "default": "v2",
-      "description": "Default version of Docker Compose (v1, v2 or none)"
-    },
-    "azureDnsAutoDetection": {
-      "type": "boolean",
-      "default": true,
-      "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
-    },
-    "dockerDefaultAddressPool": {
-      "type": "string",
-      "default": "",
-      "proposals": [],
-      "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
-    },
-    "installDockerBuildx": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install Docker Buildx"
-    },
-    "installDockerComposeSwitch": {
-      "type": "boolean",
-      "default": false,
-      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-    },
-    "disableIp6tables": {
-      "type": "boolean",
-      "default": false,
-      "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
-    }
-  },
-  "entrypoint": "/usr/local/share/docker-init.sh",
-  "privileged": true,
-  "containerEnv": {
-    "DOCKER_BUILDKIT": "1"
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-azuretools.vscode-containers"
-      ],
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
-          }
-        ]
-      }
-    }
-  },
-  "mounts": [
-    {
-      "source": "dind-var-lib-docker-${devcontainerId}",
-      "target": "/var/lib/docker",
-      "type": "volume"
-    }
-  ],
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "mounts": [
+        {
+            "source": "dind-var-lib-docker-${devcontainerId}",
+            "target": "/var/lib/docker",
+            "type": "volume"
+        }
+    ],
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index 34d464cf5..d191d9443 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,80 +1,80 @@
 {
-  "id": "docker-outside-of-docker",
-  "version": "1.7.0",
-  "name": "Docker (docker-outside-of-docker)",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
-  "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none",
-        "20.10"
-      ],
-      "default": "latest",
-      "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
+    "id": "docker-outside-of-docker",
+    "version": "1.7.0",
+    "name": "Docker (docker-outside-of-docker)",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
+    "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "20.10"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
+        },
+        "moby": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install OSS Moby build instead of Docker CE"
+        },
+        "mobyBuildxVersion": {
+            "type": "string",
+            "default": "latest",
+            "description": "Install a specific version of moby-buildx when using Moby"
+        },
+        "dockerDashComposeVersion": {
+            "type": "string",
+            "enum": [
+                "none",
+                "v1",
+                "v2"
+            ],
+            "default": "v2",
+            "description": "Compose version to use for docker-compose (v1 or v2 or none)"
+        },
+        "installDockerBuildx": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Docker Buildx"
+        },
+        "installDockerComposeSwitch": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+        }
     },
-    "moby": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install OSS Moby build instead of Docker CE"
+    "entrypoint": "/usr/local/share/docker-init.sh",
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-azuretools.vscode-containers"
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
+                    }
+                ]
+            }
+        }
     },
-    "mobyBuildxVersion": {
-      "type": "string",
-      "default": "latest",
-      "description": "Install a specific version of moby-buildx when using Moby"
-    },
-    "dockerDashComposeVersion": {
-      "type": "string",
-      "enum": [
-        "none",
-        "v1",
-        "v2"
-      ],
-      "default": "v2",
-      "description": "Compose version to use for docker-compose (v1 or v2 or none)"
-    },
-    "installDockerBuildx": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install Docker Buildx"
-    },
-    "installDockerComposeSwitch": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-    }
-  },
-  "entrypoint": "/usr/local/share/docker-init.sh",
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "ms-azuretools.vscode-containers"
-      ],
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
-          }
-        ]
-      }
-    }
-  },
-  "mounts": [
-    {
-      "source": "/var/run/docker.sock",
-      "target": "/var/run/docker-host.sock",
-      "type": "bind"
-    }
-  ],
-  "securityOpt": [
-    "label=disable"
-  ],
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ],
-  "legacyIds": [
-    "docker-from-docker"
-  ]
+    "mounts": [
+        {
+            "source": "/var/run/docker.sock",
+            "target": "/var/run/docker-host.sock",
+            "type": "bind"
+        }
+    ],
+    "securityOpt": [
+        "label=disable"
+    ],
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ],
+    "legacyIds": [
+        "docker-from-docker"
+    ]
 }
diff --git a/src/go/devcontainer-feature.json b/src/go/devcontainer-feature.json
index 81f0dd090..606069da9 100644
--- a/src/go/devcontainer-feature.json
+++ b/src/go/devcontainer-feature.json
@@ -1,54 +1,54 @@
 {
-  "id": "go",
-  "version": "1.4.0",
-  "name": "Go",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
-  "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none",
-        "1.24",
-        "1.23"
-      ],
-      "default": "latest",
-      "description": "Select or enter a Go version to install"
+    "id": "go",
+    "version": "1.4.0",
+    "name": "Go",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/go",
+    "description": "Installs Go and common Go utilities. Auto-detects latest version and installs needed dependencies.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "1.24",
+                "1.23"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Go version to install"
+        },
+        "golangciLintVersion": {
+            "type": "string",
+            "default": "latest",
+            "description": "Version of golangci-lint to install"
+        }
     },
-    "golangciLintVersion": {
-      "type": "string",
-      "default": "latest",
-      "description": "Version of golangci-lint to install"
-    }
-  },
-  "init": true,
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "golang.Go"
-      ],
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes Go and common Go utilities pre-installed and available on the `PATH`, along with the Go language extension for Go development."
-          }
-        ]
-      }
-    }
-  },
-  "containerEnv": {
-    "GOROOT": "/usr/local/go",
-    "GOPATH": "/go",
-    "PATH": "/usr/local/go/bin:/go/bin:${PATH}"
-  },
-  "capAdd": [
-    "SYS_PTRACE"
-  ],
-  "securityOpt": [
-    "seccomp=unconfined"
-  ],
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "init": true,
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "golang.Go"
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Go and common Go utilities pre-installed and available on the `PATH`, along with the Go language extension for Go development."
+                    }
+                ]
+            }
+        }
+    },
+    "containerEnv": {
+        "GOROOT": "/usr/local/go",
+        "GOPATH": "/go",
+        "PATH": "/usr/local/go/bin:/go/bin:${PATH}"
+    },
+    "capAdd": [
+        "SYS_PTRACE"
+    ],
+    "securityOpt": [
+        "seccomp=unconfined"
+    ],
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 78f05427d..36bf33b19 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,61 +1,61 @@
 {
-  "id": "kubectl-helm-minikube",
-  "version": "1.3.0",
-  "name": "Kubectl, Helm, and Minikube",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
-  "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none",
-        "1.23",
-        "1.22",
-        "1.21",
-        "none"
-      ],
-      "default": "latest",
-      "description": "Select or enter a Kubernetes version to install"
+    "id": "kubectl-helm-minikube",
+    "version": "1.3.0",
+    "name": "Kubectl, Helm, and Minikube",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
+    "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "1.23",
+                "1.22",
+                "1.21",
+                "none"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Kubernetes version to install"
+        },
+        "helm": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Helm version to install"
+        },
+        "minikube": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Minikube version to install"
+        }
     },
-    "helm": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none"
-      ],
-      "default": "latest",
-      "description": "Select or enter a Helm version to install"
+    "mounts": [
+        {
+            "source": "minikube-config",
+            "target": "/home/vscode/.minikube",
+            "type": "volume"
+        }
+    ],
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
+                    }
+                ]
+            }
+        }
     },
-    "minikube": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none"
-      ],
-      "default": "latest",
-      "description": "Select or enter a Minikube version to install"
-    }
-  },
-  "mounts": [
-    {
-      "source": "minikube-config",
-      "target": "/home/vscode/.minikube",
-      "type": "volume"
-    }
-  ],
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
-          }
-        ]
-      }
-    }
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index dd7227613..9570d556a 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,81 +1,81 @@
 {
-  "id": "node",
-  "version": "1.8.0",
-  "name": "Node.js (via nvm), yarn and pnpm.",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
-  "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "lts",
-        "latest",
-        "none",
-        "22",
-        "20"
-      ],
-      "default": "lts",
-      "description": "Select or enter a Node.js version to install"
+    "id": "node",
+    "version": "1.8.0",
+    "name": "Node.js (via nvm), yarn and pnpm.",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
+    "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "lts",
+                "latest",
+                "none",
+                "22",
+                "20"
+            ],
+            "default": "lts",
+            "description": "Select or enter a Node.js version to install"
+        },
+        "nodeGypDependencies": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install dependencies to compile native node modules (node-gyp)?"
+        },
+        "nvmInstallPath": {
+            "type": "string",
+            "default": "/usr/local/share/nvm",
+            "description": "The path where NVM will be installed."
+        },
+        "pnpmVersion": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "8.8.0",
+                "8.0.0",
+                "7.30.0",
+                "6.14.8",
+                "5.18.10",
+                "none"
+            ],
+            "default": "latest",
+            "description": "Select or enter the PNPM version to install"
+        },
+        "nvmVersion": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "0.39"
+            ],
+            "default": "latest",
+            "description": "Version of NVM to install."
+        },
+        "installYarnUsingApt": {
+            "type": "boolean",
+            "default": false,
+            "description": "On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs."
+        }
     },
-    "nodeGypDependencies": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install dependencies to compile native node modules (node-gyp)?"
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "dbaeumer.vscode-eslint"
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes `node`, `npm` and `eslint` pre-installed and available on the `PATH` for Node.js and JavaScript development."
+                    }
+                ]
+            }
+        }
     },
-    "nvmInstallPath": {
-      "type": "string",
-      "default": "/usr/local/share/nvm",
-      "description": "The path where NVM will be installed."
+    "containerEnv": {
+        "NVM_DIR": "/usr/local/share/nvm",
+        "NVM_SYMLINK_CURRENT": "true",
+        "PATH": "/usr/local/share/nvm/current/bin:${PATH}"
     },
-    "pnpmVersion": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "8.8.0",
-        "8.0.0",
-        "7.30.0",
-        "6.14.8",
-        "5.18.10",
-        "none"
-      ],
-      "default": "latest",
-      "description": "Select or enter the PNPM version to install"
-    },
-    "nvmVersion": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "0.39"
-      ],
-      "default": "latest",
-      "description": "Version of NVM to install."
-    },
-    "installYarnUsingApt": {
-      "type": "boolean",
-      "default": false,
-      "description": "On Debian and Ubuntu systems, you have the option to install Yarn globally via APT. If you choose not to use this option, Yarn will be set up using Corepack instead. This choice is specific to Debian and Ubuntu; for other Linux distributions, Yarn is always installed using Corepack, with a fallback to installation via NPM if an error occurs."
-    }
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "dbaeumer.vscode-eslint"
-      ],
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes `node`, `npm` and `eslint` pre-installed and available on the `PATH` for Node.js and JavaScript development."
-          }
-        ]
-      }
-    }
-  },
-  "containerEnv": {
-    "NVM_DIR": "/usr/local/share/nvm",
-    "NVM_SYMLINK_CURRENT": "true",
-    "PATH": "/usr/local/share/nvm/current/bin:${PATH}"
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/oryx/devcontainer-feature.json b/src/oryx/devcontainer-feature.json
index 28ac31f93..98d735b95 100644
--- a/src/oryx/devcontainer-feature.json
+++ b/src/oryx/devcontainer-feature.json
@@ -1,31 +1,31 @@
 {
-  "id": "oryx",
-  "version": "1.5.0",
-  "name": "Oryx",
-  "description": "Installs the oryx CLI",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
-  "containerEnv": {
-    "ORYX_SDK_STORAGE_BASE_URL": "https://oryx-cdn.microsoft.io",
-    "ENABLE_DYNAMIC_INSTALL": "true",
-    "DYNAMIC_INSTALL_ROOT_DIR": "/opt",
-    "ORYX_PREFER_USER_INSTALLED_SDKS": "true",
-    "ORYX_DIR": "/usr/local/oryx",
-    "DEBIAN_FLAVOR": "focal-scm",
-    "PATH": "/usr/local/oryx:${PATH}"
-  },
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes the oryx CLI pre-installed and available on the `PATH`."
-          }
-        ]
-      }
-    }
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils",
-    "ghcr.io/devcontainers/features/dotnet"
-  ]
+    "id": "oryx",
+    "version": "1.5.0",
+    "name": "Oryx",
+    "description": "Installs the oryx CLI",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
+    "containerEnv": {
+        "ORYX_SDK_STORAGE_BASE_URL": "https://oryx-cdn.microsoft.io",
+        "ENABLE_DYNAMIC_INSTALL": "true",
+        "DYNAMIC_INSTALL_ROOT_DIR": "/opt",
+        "ORYX_PREFER_USER_INSTALLED_SDKS": "true",
+        "ORYX_DIR": "/usr/local/oryx",
+        "DEBIAN_FLAVOR": "focal-scm",
+        "PATH": "/usr/local/oryx:${PATH}"
+    },
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes the oryx CLI pre-installed and available on the `PATH`."
+                    }
+                ]
+            }
+        }
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils",
+        "ghcr.io/devcontainers/features/dotnet"
+    ]
 }
diff --git a/src/php/devcontainer-feature.json b/src/php/devcontainer-feature.json
index 5cdb87747..5c8bf040d 100644
--- a/src/php/devcontainer-feature.json
+++ b/src/php/devcontainer-feature.json
@@ -1,49 +1,49 @@
 {
-  "id": "php",
-  "version": "1.2.0",
-  "name": "PHP",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "8",
-        "8.2",
-        "8.2.0",
-        "none"
-      ],
-      "default": "latest",
-      "description": "Select or enter a PHP version"
+    "id": "php",
+    "version": "1.2.0",
+    "name": "PHP",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/php",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "8",
+                "8.2",
+                "8.2.0",
+                "none"
+            ],
+            "default": "latest",
+            "description": "Select or enter a PHP version"
+        },
+        "installComposer": {
+            "type": "boolean",
+            "default": true,
+            "description": "Install PHP Composer?"
+        }
     },
-    "installComposer": {
-      "type": "boolean",
-      "default": true,
-      "description": "Install PHP Composer?"
-    }
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "xdebug.php-debug",
-        "bmewburn.vscode-intelephense-client",
-        "xdebug.php-pack",
-        "devsense.phptools-vscode"
-      ],
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes PHP pre-installed and available on the `PATH`, along with PHP language extensions for PHP development."
-          }
-        ]
-      }
-    }
-  },
-  "containerEnv": {
-    "PHP_PATH": "/usr/local/php/current",
-    "PATH": "/usr/local/php/current/bin:${PATH}"
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "xdebug.php-debug",
+                "bmewburn.vscode-intelephense-client",
+                "xdebug.php-pack",
+                "devsense.phptools-vscode"
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes PHP pre-installed and available on the `PATH`, along with PHP language extensions for PHP development."
+                    }
+                ]
+            }
+        }
+    },
+    "containerEnv": {
+        "PHP_PATH": "/usr/local/php/current",
+        "PATH": "/usr/local/php/current/bin:${PATH}"
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/ruby/devcontainer-feature.json b/src/ruby/devcontainer-feature.json
index 466c994f4..ea2b33f65 100644
--- a/src/ruby/devcontainer-feature.json
+++ b/src/ruby/devcontainer-feature.json
@@ -1,43 +1,43 @@
 {
-  "id": "ruby",
-  "version": "1.4.0",
-  "name": "Ruby (via rvm)",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
-  "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none",
-        "3.4",
-        "3.2"
-      ],
-      "default": "latest",
-      "description": "Select or enter a Ruby version to install"
-    }
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "shopify.ruby-lsp"
-      ],
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Ruby language extension for Ruby development."
-          }
-        ]
-      }
-    }
-  },
-  "containerEnv": {
-    "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global",
-    "GEM_HOME": "/usr/local/rvm/gems/default",
-    "MY_RUBY_HOME": "/usr/local/rvm/rubies/default",
-    "PATH": "/usr/local/rvm/gems/default/bin:/usr/local/rvm/gems/default@global/bin:/usr/local/rvm/rubies/default/bin:/usr/local/share/rbenv/bin:${PATH}"
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "id": "ruby",
+    "version": "1.4.0",
+    "name": "Ruby (via rvm)",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/ruby",
+    "description": "Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "3.4",
+                "3.2"
+            ],
+            "default": "latest",
+            "description": "Select or enter a Ruby version to install"
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "shopify.ruby-lsp"
+            ],
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Ruby language extension for Ruby development."
+                    }
+                ]
+            }
+        }
+    },
+    "containerEnv": {
+        "GEM_PATH": "/usr/local/rvm/gems/default:/usr/local/rvm/gems/default@global",
+        "GEM_HOME": "/usr/local/rvm/gems/default",
+        "MY_RUBY_HOME": "/usr/local/rvm/rubies/default",
+        "PATH": "/usr/local/rvm/gems/default/bin:/usr/local/rvm/gems/default@global/bin:/usr/local/rvm/rubies/default/bin:/usr/local/share/rbenv/bin:${PATH}"
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/rust/devcontainer-feature.json b/src/rust/devcontainer-feature.json
index 235879c9a..651483518 100644
--- a/src/rust/devcontainer-feature.json
+++ b/src/rust/devcontainer-feature.json
@@ -1,106 +1,106 @@
 {
-  "id": "rust",
-  "version": "1.6.0",
-  "name": "Rust",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
-  "description": "Installs Rust, common Rust utilities, and their required dependencies",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest",
-        "none",
-        "1.87",
-        "1.86",
-        "1.85",
-        "1.84",
-        "1.83",
-        "1.82",
-        "1.81",
-        "1.80",
-        "1.79",
-        "1.78",
-        "1.77",
-        "1.76",
-        "1.75",
-        "1.74",
-        "1.73",
-        "1.72",
-        "1.71",
-        "1.70",
-        "1.69",
-        "1.68",
-        "1.67",
-        "1.66",
-        "1.65",
-        "1.64"
-      ],
-      "default": "latest",
-      "description": "Select or enter a version of Rust to install."
+    "id": "rust",
+    "version": "1.6.0",
+    "name": "Rust",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/rust",
+    "description": "Installs Rust, common Rust utilities, and their required dependencies",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "none",
+                "1.87",
+                "1.86",
+                "1.85",
+                "1.84",
+                "1.83",
+                "1.82",
+                "1.81",
+                "1.80",
+                "1.79",
+                "1.78",
+                "1.77",
+                "1.76",
+                "1.75",
+                "1.74",
+                "1.73",
+                "1.72",
+                "1.71",
+                "1.70",
+                "1.69",
+                "1.68",
+                "1.67",
+                "1.66",
+                "1.65",
+                "1.64"
+            ],
+            "default": "latest",
+            "description": "Select or enter a version of Rust to install."
+        },
+        "profile": {
+            "type": "string",
+            "proposals": [
+                "minimal",
+                "default",
+                "complete"
+            ],
+            "default": "minimal",
+            "description": "Select a rustup install profile."
+        },
+        "targets": {
+            "type": "string",
+            "default": "",
+            "description": "Optional comma separated list of additional Rust targets to install.",
+            "proposals": [
+                "aarch64-unknown-linux-gnu",
+                "armv7-unknown-linux-gnueabihf",
+                "x86_64-unknown-redox,x86_64-unknown-uefi"
+            ]
+        },
+        "components": {
+            "type": "string",
+            "default": "rust-analyzer,rust-src,rustfmt,clippy",
+            "description": "Optional, comma separated list of Rust components to be installed",
+            "proposals": [
+                "rust-analyzer,rust-src,rustfmt,clippy",
+                "rust-analyzer,rust-src",
+                "rustfmt,clippy,rust-docs",
+                "llvm-tools-preview,rust-src,rustfmt"
+            ]
+        }
     },
-    "profile": {
-      "type": "string",
-      "proposals": [
-        "minimal",
-        "default",
-        "complete"
-      ],
-      "default": "minimal",
-      "description": "Select a rustup install profile."
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "vadimcn.vscode-lldb",
+                "rust-lang.rust-analyzer",
+                "tamasfe.even-better-toml"
+            ],
+            "settings": {
+                "files.watcherExclude": {
+                    "**/target/**": true
+                },
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes Rust, common Rust utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Rust language extension for Rust development."
+                    }
+                ]
+            }
+        }
     },
-    "targets": {
-      "type": "string",
-      "default": "",
-      "description": "Optional comma separated list of additional Rust targets to install.",
-      "proposals": [
-        "aarch64-unknown-linux-gnu",
-        "armv7-unknown-linux-gnueabihf",
-        "x86_64-unknown-redox,x86_64-unknown-uefi"
-      ]
+    "containerEnv": {
+        "CARGO_HOME": "/usr/local/cargo",
+        "RUSTUP_HOME": "/usr/local/rustup",
+        "PATH": "/usr/local/cargo/bin:${PATH}"
     },
-    "components": {
-      "type": "string",
-      "default": "rust-analyzer,rust-src,rustfmt,clippy",
-      "description": "Optional, comma separated list of Rust components to be installed",
-      "proposals": [
-        "rust-analyzer,rust-src,rustfmt,clippy",
-        "rust-analyzer,rust-src",
-        "rustfmt,clippy,rust-docs",
-        "llvm-tools-preview,rust-src,rustfmt"
-      ]
-    }
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "vadimcn.vscode-lldb",
-        "rust-lang.rust-analyzer",
-        "tamasfe.even-better-toml"
-      ],
-      "settings": {
-        "files.watcherExclude": {
-          "**/target/**": true
-        },
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes Rust, common Rust utilities, and needed dependencies pre-installed and available on the `PATH`, along with the Rust language extension for Rust development."
-          }
-        ]
-      }
-    }
-  },
-  "containerEnv": {
-    "CARGO_HOME": "/usr/local/cargo",
-    "RUSTUP_HOME": "/usr/local/rustup",
-    "PATH": "/usr/local/cargo/bin:${PATH}"
-  },
-  "capAdd": [
-    "SYS_PTRACE"
-  ],
-  "securityOpt": [
-    "seccomp=unconfined"
-  ],
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "capAdd": [
+        "SYS_PTRACE"
+    ],
+    "securityOpt": [
+        "seccomp=unconfined"
+    ],
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }
diff --git a/src/sshd/devcontainer-feature.json b/src/sshd/devcontainer-feature.json
index eb8c82909..61600917a 100644
--- a/src/sshd/devcontainer-feature.json
+++ b/src/sshd/devcontainer-feature.json
@@ -1,42 +1,42 @@
 {
-  "id": "sshd",
-  "version": "1.2.0",
-  "name": "SSH server",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
-  "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
-  "options": {
-    "version": {
-      "type": "string",
-      "proposals": [
-        "latest"
-      ],
-      "default": "latest",
-      "description": "Currently unused."
+    "id": "sshd",
+    "version": "1.2.0",
+    "name": "SSH server",
+    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/sshd",
+    "description": "Adds a SSH server into a container so that you can use an external terminal, sftp, or SSHFS to interact with it.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest"
+            ],
+            "default": "latest",
+            "description": "Currently unused."
+        },
+        "gatewayPorts": {
+            "type": "string",
+            "enum": [
+                "no",
+                "yes",
+                "clientspecified"
+            ],
+            "default": "no",
+            "description": "Enable other hosts in the same network to connect to the forwarded ports"
+        }
     },
-    "gatewayPorts": {
-      "type": "string",
-      "enum": [
-        "no",
-        "yes",
-        "clientspecified"
-      ],
-      "default": "no",
-      "description": "Enable other hosts in the same network to connect to the forwarded ports"
-    }
-  },
-  "entrypoint": "/usr/local/share/ssh-init.sh",
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "github.copilot.chat.codeGeneration.instructions": [
-          {
-            "text": "This dev container includes an SSH server so that you can use an external terminal, sftp, or SSHFS to interact with it. The first time you've started the container, you will want to set a password for your user. With each connection to the container, you'll want to forward the SSH port to your local machine and use a local terminal or other tool to connect using the password you set."
-          }
-        ]
-      }
-    }
-  },
-  "installsAfter": [
-    "ghcr.io/devcontainers/features/common-utils"
-  ]
+    "entrypoint": "/usr/local/share/ssh-init.sh",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "github.copilot.chat.codeGeneration.instructions": [
+                    {
+                        "text": "This dev container includes an SSH server so that you can use an external terminal, sftp, or SSHFS to interact with it. The first time you've started the container, you will want to set a password for your user. With each connection to the container, you'll want to forward the SSH port to your local machine and use a local terminal or other tool to connect using the password you set."
+                    }
+                ]
+            }
+        }
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
 }

From e3592465992b0b27026d037a9b948532613dd898 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 6 Feb 2026 13:27:03 +0000
Subject: [PATCH 09/16] Rename _common to .common to fix validation failure

The validator expects all directories in src/ to be valid features with devcontainer-feature.json. By renaming to .common (hidden directory), it's excluded from validation while remaining accessible to features.

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/{_common => .common}/README.md             | 8 ++++----
 src/{_common => .common}/common-setup.sh       | 0
 src/anaconda/install.sh                        | 2 +-
 src/common-utils/main.sh                       | 2 +-
 src/conda/install.sh                           | 2 +-
 src/desktop-lite/install.sh                    | 2 +-
 src/docker-in-docker/install.sh                | 2 +-
 src/docker-outside-of-docker/install.sh        | 2 +-
 src/go/install.sh                              | 2 +-
 src/hugo/install.sh                            | 2 +-
 src/java/install.sh                            | 2 +-
 src/kubectl-helm-minikube/install.sh           | 2 +-
 src/node/install.sh                            | 2 +-
 src/oryx/install.sh                            | 2 +-
 src/php/install.sh                             | 2 +-
 src/python/install.sh                          | 2 +-
 src/ruby/install.sh                            | 2 +-
 src/rust/install.sh                            | 2 +-
 src/sshd/install.sh                            | 2 +-
 test/{_common => .common}/test-common-setup.sh | 2 +-
 20 files changed, 22 insertions(+), 22 deletions(-)
 rename src/{_common => .common}/README.md (94%)
 rename src/{_common => .common}/common-setup.sh (100%)
 rename test/{_common => .common}/test-common-setup.sh (99%)

diff --git a/src/_common/README.md b/src/.common/README.md
similarity index 94%
rename from src/_common/README.md
rename to src/.common/README.md
index 64ea15c66..e614bc005 100644
--- a/src/_common/README.md
+++ b/src/.common/README.md
@@ -15,7 +15,7 @@ Determines the appropriate non-root user based on the input username.
 **Usage:**
 ```bash
 # Source the helper script
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
@@ -64,10 +64,10 @@ Prints the resolved username to stdout, which can be captured using command subs
 
 ## Testing
 
-Tests for the helper scripts are located in `/test/_common/`. Run the tests with:
+Tests for the helper scripts are located in `/test/.common/`. Run the tests with:
 
 ```bash
-bash test/_common/test-common-setup.sh
+bash test/.common/test-common-setup.sh
 ```
 
 ## Edge Cases
@@ -110,7 +110,7 @@ fi
 ```bash
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/_common/common-setup.sh b/src/.common/common-setup.sh
similarity index 100%
rename from src/_common/common-setup.sh
rename to src/.common/common-setup.sh
diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 01b7b15ef..2fc5d411a 100755
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -83,7 +83,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index eaa4cb512..0374a9302 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -401,7 +401,7 @@ esac
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Handle the special "none" case for common-utils before user determination
 # The "none" case sets USER_UID and USER_GID to 0
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 20e4feeac..1e7b49089 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -29,7 +29,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index 3f366b354..f704cd7e2 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -73,7 +73,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index db365d394..d0197c644 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -46,7 +46,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 034dde234..a81970d51 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -40,7 +40,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/go/install.sh b/src/go/install.sh
index f4628b37e..290a1555b 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -176,7 +176,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/hugo/install.sh b/src/hugo/install.sh
index bbfd2bb13..67de944f8 100755
--- a/src/hugo/install.sh
+++ b/src/hugo/install.sh
@@ -31,7 +31,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/java/install.sh b/src/java/install.sh
index f1d13d201..097996f60 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -156,7 +156,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index cbafb18e9..6d7ffae07 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -30,7 +30,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/node/install.sh b/src/node/install.sh
index 4649903ad..ef33289bd 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -243,7 +243,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index b43580b23..6242b7782 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -27,7 +27,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/php/install.sh b/src/php/install.sh
index 4eea3a4ed..4b84bc1b4 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -38,7 +38,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # If in automatic mode, determine if a user already exists, if not use root
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/python/install.sh b/src/python/install.sh
index 86345bd34..540a9c3c2 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -837,7 +837,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 87a6d7384..1063d3377 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -41,7 +41,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/rust/install.sh b/src/rust/install.sh
index 54bcd1748..c46b8f50e 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -103,7 +103,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/sshd/install.sh b/src/sshd/install.sh
index 281d095b4..2bfbdaa4f 100755
--- a/src/sshd/install.sh
+++ b/src/sshd/install.sh
@@ -27,7 +27,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../_common/common-setup.sh"
+source "${SCRIPT_DIR}/../.common/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/test/_common/test-common-setup.sh b/test/.common/test-common-setup.sh
similarity index 99%
rename from test/_common/test-common-setup.sh
rename to test/.common/test-common-setup.sh
index 149571e50..c8f79a1da 100755
--- a/test/_common/test-common-setup.sh
+++ b/test/.common/test-common-setup.sh
@@ -8,7 +8,7 @@ set -e
 
 # Source the helper script
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../../src/_common/common-setup.sh"
+source "${SCRIPT_DIR}/../../src/.common/common-setup.sh"
 
 # Test counters
 PASSED=0

From 3592f9057418c6aaebfaee4fc32d02d202ca5082 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 6 Feb 2026 17:20:14 +0000
Subject: [PATCH 10/16] Deploy common-setup.sh to each feature's _lib directory

The devcontainer CLI packages each feature independently and doesn't include parent directories or hidden directories in the build context. The helper script must be copied into each feature's _lib/ directory to be accessible at runtime.

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/.common/README.md                         | 122 ------------------
 .../_lib}/common-setup.sh                     |   0
 src/anaconda/install.sh                       |   2 +-
 src/common-utils/_lib/common-setup.sh         |  87 +++++++++++++
 src/common-utils/main.sh                      |   2 +-
 src/conda/_lib/common-setup.sh                |  87 +++++++++++++
 src/conda/install.sh                          |   2 +-
 src/desktop-lite/_lib/common-setup.sh         |  87 +++++++++++++
 src/desktop-lite/install.sh                   |   2 +-
 src/docker-in-docker/_lib/common-setup.sh     |  87 +++++++++++++
 src/docker-in-docker/install.sh               |   2 +-
 .../_lib/common-setup.sh                      |  87 +++++++++++++
 src/docker-outside-of-docker/install.sh       |   2 +-
 src/go/_lib/common-setup.sh                   |  87 +++++++++++++
 src/go/install.sh                             |   2 +-
 src/hugo/_lib/common-setup.sh                 |  87 +++++++++++++
 src/hugo/install.sh                           |   2 +-
 src/java/_lib/common-setup.sh                 |  87 +++++++++++++
 src/java/install.sh                           |   2 +-
 .../_lib/common-setup.sh                      |  87 +++++++++++++
 src/kubectl-helm-minikube/install.sh          |   2 +-
 src/node/_lib/common-setup.sh                 |  87 +++++++++++++
 src/node/install.sh                           |   2 +-
 src/oryx/_lib/common-setup.sh                 |  87 +++++++++++++
 src/oryx/install.sh                           |   2 +-
 src/php/_lib/common-setup.sh                  |  87 +++++++++++++
 src/php/install.sh                            |   2 +-
 src/python/_lib/common-setup.sh               |  87 +++++++++++++
 src/python/install.sh                         |   2 +-
 src/ruby/_lib/common-setup.sh                 |  87 +++++++++++++
 src/ruby/install.sh                           |   2 +-
 src/rust/_lib/common-setup.sh                 |  87 +++++++++++++
 src/rust/install.sh                           |   2 +-
 src/sshd/_lib/common-setup.sh                 |  87 +++++++++++++
 src/sshd/install.sh                           |   2 +-
 test/_lib/README.md                           |  31 +++++
 test/{.common => _lib}/test-common-setup.sh   |   4 +-
 37 files changed, 1442 insertions(+), 141 deletions(-)
 delete mode 100644 src/.common/README.md
 rename src/{.common => anaconda/_lib}/common-setup.sh (100%)
 create mode 100644 src/common-utils/_lib/common-setup.sh
 create mode 100644 src/conda/_lib/common-setup.sh
 create mode 100644 src/desktop-lite/_lib/common-setup.sh
 create mode 100644 src/docker-in-docker/_lib/common-setup.sh
 create mode 100644 src/docker-outside-of-docker/_lib/common-setup.sh
 create mode 100644 src/go/_lib/common-setup.sh
 create mode 100644 src/hugo/_lib/common-setup.sh
 create mode 100644 src/java/_lib/common-setup.sh
 create mode 100644 src/kubectl-helm-minikube/_lib/common-setup.sh
 create mode 100644 src/node/_lib/common-setup.sh
 create mode 100644 src/oryx/_lib/common-setup.sh
 create mode 100644 src/php/_lib/common-setup.sh
 create mode 100644 src/python/_lib/common-setup.sh
 create mode 100644 src/ruby/_lib/common-setup.sh
 create mode 100644 src/rust/_lib/common-setup.sh
 create mode 100644 src/sshd/_lib/common-setup.sh
 create mode 100644 test/_lib/README.md
 rename test/{.common => _lib}/test-common-setup.sh (98%)

diff --git a/src/.common/README.md b/src/.common/README.md
deleted file mode 100644
index e614bc005..000000000
--- a/src/.common/README.md
+++ /dev/null
@@ -1,122 +0,0 @@
-# Common Helper Scripts
-
-This directory contains common helper scripts that can be shared across multiple features to avoid code duplication.
-
-## common-setup.sh
-
-A helper script that provides common setup functions used across multiple features.
-
-### Functions
-
-#### `determine_user_from_input`
-
-Determines the appropriate non-root user based on the input username.
-
-**Usage:**
-```bash
-# Source the helper script
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
-
-# Determine the user
-USERNAME=$(determine_user_from_input "${USERNAME}" "root")
-```
-
-**Parameters:**
-- `$1` (required): Input username from feature configuration (e.g., "automatic", "auto", "none", or a specific username)
-- `$2` (optional): Fallback username when no user is found in automatic mode (defaults to "root")
-
-**Behavior:**
-- **"auto" or "automatic"**: 
-  - First checks if `_REMOTE_USER` environment variable is set and is not "root"
-  - If `_REMOTE_USER` is root or not set, searches for an existing user from the priority list:
-    1. `devcontainer`
-    2. `vscode`
-    3. `node`
-    4. `codespace`
-    5. User with UID 1000 (from `/etc/passwd`)
-  - If no user is found, returns the fallback user (default: "root")
-  
-- **"none"**: Always returns "root"
-
-- **Specific username**: 
-  - Validates the user exists using `id -u`
-  - If the user exists, returns that username
-  - If the user doesn't exist, returns "root"
-
-**Examples:**
-
-```bash
-# Basic usage with default fallback (root)
-USERNAME=$(determine_user_from_input "automatic")
-
-# With custom fallback
-USERNAME=$(determine_user_from_input "automatic" "vscode")
-
-# Explicit user
-USERNAME=$(determine_user_from_input "myuser")
-
-# None (always returns root)
-USERNAME=$(determine_user_from_input "none")
-```
-
-**Return Value:**
-Prints the resolved username to stdout, which can be captured using command substitution.
-
-## Testing
-
-Tests for the helper scripts are located in `/test/.common/`. Run the tests with:
-
-```bash
-bash test/.common/test-common-setup.sh
-```
-
-## Edge Cases
-
-The helper handles several edge cases:
-
-1. **Missing awk**: Some systems (like Mariner) don't have awk by default. Features should install it before sourcing the helper if needed.
-
-2. **UID 1000 lookup**: The user with UID 1000 is included in the search as it's commonly the first non-system user created.
-
-3. **_REMOTE_USER behavior**: When `_REMOTE_USER` is set to a non-root user, it takes priority over all other detection methods in automatic mode.
-
-4. **Empty user list entries**: The helper safely handles empty entries in the user detection loop.
-
-## Migration Guide
-
-To migrate an existing feature to use the common helper:
-
-### Before:
-```bash
-# Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
-    USERNAME=""
-    POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
-    for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-        if id -u ${CURRENT_USER} > /dev/null 2>&1; then
-            USERNAME=${CURRENT_USER}
-            break
-        fi
-    done
-    if [ "${USERNAME}" = "" ]; then
-        USERNAME=root
-    fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
-    USERNAME=root
-fi
-```
-
-### After:
-```bash
-# Source common helper functions
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
-
-# Determine the appropriate non-root user
-USERNAME=$(determine_user_from_input "${USERNAME}" "root")
-```
-
-**Note:** For features like `common-utils` that create users and need a different fallback, use:
-```bash
-USERNAME=$(determine_user_from_input "${USERNAME}" "vscode")
-```
diff --git a/src/.common/common-setup.sh b/src/anaconda/_lib/common-setup.sh
similarity index 100%
rename from src/.common/common-setup.sh
rename to src/anaconda/_lib/common-setup.sh
diff --git a/src/anaconda/install.sh b/src/anaconda/install.sh
index 2fc5d411a..dd2e523be 100755
--- a/src/anaconda/install.sh
+++ b/src/anaconda/install.sh
@@ -83,7 +83,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/common-utils/_lib/common-setup.sh b/src/common-utils/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/common-utils/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 0374a9302..42a41bc81 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -401,7 +401,7 @@ esac
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Handle the special "none" case for common-utils before user determination
 # The "none" case sets USER_UID and USER_GID to 0
diff --git a/src/conda/_lib/common-setup.sh b/src/conda/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/conda/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 1e7b49089..4d1cf2237 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -29,7 +29,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/desktop-lite/_lib/common-setup.sh b/src/desktop-lite/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/desktop-lite/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/desktop-lite/install.sh b/src/desktop-lite/install.sh
index f704cd7e2..47ae44857 100755
--- a/src/desktop-lite/install.sh
+++ b/src/desktop-lite/install.sh
@@ -73,7 +73,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/docker-in-docker/_lib/common-setup.sh b/src/docker-in-docker/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/docker-in-docker/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index d0197c644..e484e40a2 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -46,7 +46,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/docker-outside-of-docker/_lib/common-setup.sh b/src/docker-outside-of-docker/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/docker-outside-of-docker/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index a81970d51..1b555b522 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -40,7 +40,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/go/_lib/common-setup.sh b/src/go/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/go/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/go/install.sh b/src/go/install.sh
index 290a1555b..825bae28e 100755
--- a/src/go/install.sh
+++ b/src/go/install.sh
@@ -176,7 +176,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/hugo/_lib/common-setup.sh b/src/hugo/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/hugo/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/hugo/install.sh b/src/hugo/install.sh
index 67de944f8..4c605a473 100755
--- a/src/hugo/install.sh
+++ b/src/hugo/install.sh
@@ -31,7 +31,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/java/_lib/common-setup.sh b/src/java/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/java/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/java/install.sh b/src/java/install.sh
index 097996f60..39a2d77c6 100644
--- a/src/java/install.sh
+++ b/src/java/install.sh
@@ -156,7 +156,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/kubectl-helm-minikube/_lib/common-setup.sh b/src/kubectl-helm-minikube/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/kubectl-helm-minikube/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index 6d7ffae07..ce97193d1 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -30,7 +30,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/node/_lib/common-setup.sh b/src/node/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/node/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/node/install.sh b/src/node/install.sh
index ef33289bd..ac04bbed1 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -243,7 +243,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/oryx/_lib/common-setup.sh b/src/oryx/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/oryx/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/oryx/install.sh b/src/oryx/install.sh
index 6242b7782..47260748e 100755
--- a/src/oryx/install.sh
+++ b/src/oryx/install.sh
@@ -27,7 +27,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/php/_lib/common-setup.sh b/src/php/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/php/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/php/install.sh b/src/php/install.sh
index 4b84bc1b4..a71f2ad3a 100755
--- a/src/php/install.sh
+++ b/src/php/install.sh
@@ -38,7 +38,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # If in automatic mode, determine if a user already exists, if not use root
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/python/_lib/common-setup.sh b/src/python/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/python/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/python/install.sh b/src/python/install.sh
index 540a9c3c2..75c18c4eb 100755
--- a/src/python/install.sh
+++ b/src/python/install.sh
@@ -837,7 +837,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/ruby/_lib/common-setup.sh b/src/ruby/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/ruby/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/ruby/install.sh b/src/ruby/install.sh
index 1063d3377..124070952 100755
--- a/src/ruby/install.sh
+++ b/src/ruby/install.sh
@@ -41,7 +41,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/rust/_lib/common-setup.sh b/src/rust/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/rust/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/rust/install.sh b/src/rust/install.sh
index c46b8f50e..5a6410e6d 100755
--- a/src/rust/install.sh
+++ b/src/rust/install.sh
@@ -103,7 +103,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/src/sshd/_lib/common-setup.sh b/src/sshd/_lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/src/sshd/_lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/src/sshd/install.sh b/src/sshd/install.sh
index 2bfbdaa4f..f72e1ef48 100755
--- a/src/sshd/install.sh
+++ b/src/sshd/install.sh
@@ -27,7 +27,7 @@ fi
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../.common/common-setup.sh"
+source "${SCRIPT_DIR}/_lib/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")
diff --git a/test/_lib/README.md b/test/_lib/README.md
new file mode 100644
index 000000000..483fd2961
--- /dev/null
+++ b/test/_lib/README.md
@@ -0,0 +1,31 @@
+# Common Helper Function Tests
+
+This directory contains tests for the common-setup.sh helper function that is deployed to each feature.
+
+## Structure
+
+The `common-setup.sh` helper script is **not** shared from a central location. Instead, it's copied into each feature's `_lib/` directory:
+- `src/anaconda/_lib/common-setup.sh`
+- `src/docker-in-docker/_lib/common-setup.sh`
+- etc.
+
+This is because the devcontainer CLI packages each feature independently, and external directories are not included in the build context.
+
+## Running Tests
+
+```bash
+bash test/_lib/test-common-setup.sh
+```
+
+The tests reference one of the feature copies (anaconda) as the source of truth for validation.
+
+## Updating the Helper
+
+If you need to update the helper function:
+
+1. Update the source in any feature's `_lib/common-setup.sh`
+2. Copy it to all other features' `_lib/` directories
+3. Run the tests to verify functionality
+4. Update all affected features' versions
+
+Note: All copies should be kept in sync to ensure consistent behavior across features.
diff --git a/test/.common/test-common-setup.sh b/test/_lib/test-common-setup.sh
similarity index 98%
rename from test/.common/test-common-setup.sh
rename to test/_lib/test-common-setup.sh
index c8f79a1da..e0ec32345 100755
--- a/test/.common/test-common-setup.sh
+++ b/test/_lib/test-common-setup.sh
@@ -6,9 +6,9 @@
 
 set -e
 
-# Source the helper script
+# Source the helper script from anaconda feature as reference
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/../../src/.common/common-setup.sh"
+source "${SCRIPT_DIR}/../../src/anaconda/_lib/common-setup.sh"
 
 # Test counters
 PASSED=0

From d0362963f3d11598e15551a9d47a2eb2ce61b7cc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 6 Feb 2026 17:26:33 +0000
Subject: [PATCH 11/16] Add sync mechanism for shared code with single source
 of truth

Created scripts/lib/common-setup.sh as the source of truth and scripts/sync-common-setup.sh to deploy to all features. This provides a shared code model within devcontainer packaging constraints.

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 SHARED_CODE.md               | 94 ++++++++++++++++++++++++++++++++++++
 scripts/README.md            | 59 ++++++++++++++++++++++
 scripts/lib/common-setup.sh  | 87 +++++++++++++++++++++++++++++++++
 scripts/sync-common-setup.sh | 75 ++++++++++++++++++++++++++++
 4 files changed, 315 insertions(+)
 create mode 100644 SHARED_CODE.md
 create mode 100644 scripts/README.md
 create mode 100644 scripts/lib/common-setup.sh
 create mode 100755 scripts/sync-common-setup.sh

diff --git a/SHARED_CODE.md b/SHARED_CODE.md
new file mode 100644
index 000000000..7ec9479be
--- /dev/null
+++ b/SHARED_CODE.md
@@ -0,0 +1,94 @@
+# Shared Code Maintenance
+
+This document explains how shared code is maintained across features in this repository.
+
+## Problem
+
+Multiple features need the same helper functions (e.g., user selection logic). The devcontainer specification currently packages each feature independently and doesn't support sharing code between features at runtime.
+
+## Solution
+
+We maintain a **single source of truth** with a **sync mechanism** to deploy to each feature:
+
+### Single Source
+- **Location**: `scripts/lib/common-setup.sh`
+- **Contains**: Shared helper functions (currently user selection logic)
+- **Maintenance**: All updates happen here
+
+### Deployment
+- **Mechanism**: `scripts/sync-common-setup.sh`
+- **Target**: Copies to each feature's `_lib/` directory
+- **Reason**: Devcontainer packaging requires files to be within each feature's directory
+
+## Workflow
+
+### Making Changes
+
+1. **Edit the source**: Modify `scripts/lib/common-setup.sh`
+2. **Test**: Run `bash test/_lib/test-common-setup.sh`
+3. **Sync**: Run `./scripts/sync-common-setup.sh`
+4. **Commit**: Include both source and deployed copies
+
+```bash
+# Edit the source
+vim scripts/lib/common-setup.sh
+
+# Test
+bash test/_lib/test-common-setup.sh
+
+# Deploy to all features
+./scripts/sync-common-setup.sh
+
+# Commit everything
+git add scripts/lib/common-setup.sh src/*/_lib/common-setup.sh
+git commit -m "Update common-setup.sh helper function"
+```
+
+### Verification
+
+The sync script is idempotent - running it multiple times with the same source produces the same result. After syncing, you can verify:
+
+```bash
+# Check that all copies are identical
+for f in src/*/_lib/common-setup.sh; do
+    diff -q scripts/lib/common-setup.sh "$f" || echo "MISMATCH: $f"
+done
+```
+
+## Why Not Use Shared Files?
+
+The devcontainer CLI packages each feature independently. When a feature is installed:
+
+1. Only files within the feature's directory are included in the package
+2. Parent directories (`../common`) are not accessible
+3. Hidden directories (`.common`) are excluded from packaging
+4. Sibling feature directories are not accessible
+
+This is a design decision in the devcontainer specification to ensure features are portable and self-contained.
+
+## Future
+
+The devcontainer spec has a proposal for an `include` property in `devcontainer-feature.json` ([spec#129](https://github.com/devcontainers/spec/issues/129)) that would enable native code sharing. Once implemented, the sync mechanism can be removed in favor of declarative includes:
+
+```json
+{
+  "id": "my-feature",
+  "include": ["../../scripts/lib/common-setup.sh"]
+}
+```
+
+## Current Implementation
+
+As of this PR:
+- **Source**: `scripts/lib/common-setup.sh` (87 lines)
+- **Deployed**: 17 features, each with `src/FEATURE/_lib/common-setup.sh`
+- **Sync Script**: `scripts/sync-common-setup.sh`
+- **Tests**: `test/_lib/test-common-setup.sh` (14 test cases)
+- **Benefits**: Eliminated ~188 lines of inline duplicated logic from install scripts
+
+## References
+
+- [Devcontainer Spec Issue #129 - Share code between features](https://github.com/devcontainers/spec/issues/129)
+- [Features Library Proposal](https://github.com/devcontainers/spec/blob/main/proposals/features-library.md)
+- Test documentation: `test/_lib/README.md`
+- Sync script documentation: `scripts/README.md`
diff --git a/scripts/README.md b/scripts/README.md
new file mode 100644
index 000000000..4f295cb73
--- /dev/null
+++ b/scripts/README.md
@@ -0,0 +1,59 @@
+# Shared Feature Code
+
+This directory contains code that is shared across multiple features.
+
+## Structure
+
+```
+scripts/
+├── lib/
+│   └── common-setup.sh         # Source of truth for user selection helper
+└── sync-common-setup.sh         # Script to deploy helper to all features
+```
+
+## Maintenance
+
+### The Source of Truth
+
+**`scripts/lib/common-setup.sh`** is the single source of truth for the user selection helper function. All modifications should be made to this file.
+
+### Deploying Changes
+
+Due to the devcontainer CLI's packaging behavior (each feature is packaged independently), the helper must be deployed to each feature's `_lib/` directory. We maintain this through a sync script:
+
+```bash
+./scripts/sync-common-setup.sh
+```
+
+This copies `scripts/lib/common-setup.sh` to all features:
+- `src/anaconda/_lib/common-setup.sh`
+- `src/docker-in-docker/_lib/common-setup.sh`
+- etc.
+
+### Workflow
+
+1. **Edit**: Make changes to `scripts/lib/common-setup.sh`
+2. **Test**: Run `bash test/_lib/test-common-setup.sh` to verify
+3. **Sync**: Run `./scripts/sync-common-setup.sh` to deploy to all features
+4. **Commit**: Commit both the source and all copies together
+
+### Why Copies?
+
+The devcontainer CLI packages each feature independently:
+- Parent directories are not included in the build context
+- Hidden directories (`.common`) are not included
+- Sibling directories are not accessible
+
+Therefore, each feature needs its own copy of the helper to ensure it's available at runtime during feature installation.
+
+## Testing
+
+Tests are located in `test/_lib/` and reference the anaconda feature's copy as the source:
+
+```bash
+bash test/_lib/test-common-setup.sh
+```
+
+## Future
+
+This approach is a workaround for the current limitation. The devcontainer spec has a proposal for an `include` property in `devcontainer-feature.json` that would allow native code sharing (see [devcontainers/spec#129](https://github.com/devcontainers/spec/issues/129)). Once implemented, this sync mechanism can be removed.
diff --git a/scripts/lib/common-setup.sh b/scripts/lib/common-setup.sh
new file mode 100644
index 000000000..d2ac866cf
--- /dev/null
+++ b/scripts/lib/common-setup.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Helper script for common feature setup tasks, including user selection logic.
+# Maintainer: The Dev Container spec maintainers
+
+# Determine the appropriate non-root user
+# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
+#
+# This function resolves the USERNAME variable based on the input value:
+# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
+# - If USERNAME is "none" or doesn't exist, it will fall back to root
+# - Otherwise, it validates the specified USERNAME exists
+#
+# Arguments:
+#   USERNAME - The username input (typically from feature configuration)
+#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
+#
+# Returns:
+#   The resolved username is printed to stdout
+#
+# Examples:
+#   USERNAME=$(determine_user_from_input "automatic")
+#   USERNAME=$(determine_user_from_input "vscode")
+#   USERNAME=$(determine_user_from_input "auto" "vscode")
+#
+determine_user_from_input() {
+    local input_username="${1:-automatic}"
+    local fallback_user="${2:-root}"
+    local resolved_username=""
+
+    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
+        # Automatic mode: try to detect an existing non-root user
+        
+        # First, check if _REMOTE_USER is set and is not root
+        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
+            # Verify the user exists before using it
+            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
+                resolved_username="${_REMOTE_USER}"
+            else
+                # _REMOTE_USER doesn't exist, fall through to normal detection
+                resolved_username=""
+            fi
+        fi
+        
+        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
+        if [ -z "${resolved_username}" ]; then
+            # Try to find a non-root user from a list of common usernames
+            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
+            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
+            
+            for current_user in "${possible_users[@]}"; do
+                # Skip empty entries
+                if [ -z "${current_user}" ]; then
+                    continue
+                fi
+                
+                # Check if user exists
+                if id -u "${current_user}" > /dev/null 2>&1; then
+                    resolved_username="${current_user}"
+                    break
+                fi
+            done
+            
+            # If no user found, use the fallback
+            if [ -z "${resolved_username}" ]; then
+                resolved_username="${fallback_user}"
+            fi
+        fi
+    elif [ "${input_username}" = "none" ]; then
+        # Explicit "none" means use root
+        resolved_username="root"
+    else
+        # Specific username provided - validate it exists
+        if id -u "${input_username}" > /dev/null 2>&1; then
+            resolved_username="${input_username}"
+        else
+            # User doesn't exist, fall back to root
+            resolved_username="root"
+        fi
+    fi
+
+    echo "${resolved_username}"
+}
diff --git a/scripts/sync-common-setup.sh b/scripts/sync-common-setup.sh
new file mode 100755
index 000000000..74f668617
--- /dev/null
+++ b/scripts/sync-common-setup.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
+#-------------------------------------------------------------------------------------------------------------------------
+#
+# Script to sync common-setup.sh from the source to all feature _lib directories
+# This maintains a single source of truth while deploying to each feature for packaging
+#
+# Usage: ./scripts/sync-common-setup.sh
+#
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+
+# The source of truth for common-setup.sh
+SOURCE_FILE="${REPO_ROOT}/scripts/lib/common-setup.sh"
+
+# Features that use the common-setup helper
+FEATURES=(
+    "anaconda"
+    "common-utils"
+    "conda"
+    "desktop-lite"
+    "docker-in-docker"
+    "docker-outside-of-docker"
+    "go"
+    "hugo"
+    "java"
+    "kubectl-helm-minikube"
+    "node"
+    "oryx"
+    "php"
+    "python"
+    "ruby"
+    "rust"
+    "sshd"
+)
+
+echo "Syncing common-setup.sh to all features..."
+echo "Source: ${SOURCE_FILE}"
+echo ""
+
+if [ ! -f "${SOURCE_FILE}" ]; then
+    echo "Error: Source file not found: ${SOURCE_FILE}"
+    exit 1
+fi
+
+UPDATED_COUNT=0
+
+for feature in "${FEATURES[@]}"; do
+    TARGET_DIR="${REPO_ROOT}/src/${feature}/_lib"
+    TARGET_FILE="${TARGET_DIR}/common-setup.sh"
+    
+    # Create _lib directory if it doesn't exist
+    mkdir -p "${TARGET_DIR}"
+    
+    # Copy the file
+    cp "${SOURCE_FILE}" "${TARGET_FILE}"
+    
+    echo "✓ Synced to src/${feature}/_lib/common-setup.sh"
+    UPDATED_COUNT=$((UPDATED_COUNT + 1))
+done
+
+echo ""
+echo "======================================"
+echo "Sync complete!"
+echo "Updated ${UPDATED_COUNT} features"
+echo "======================================"
+echo ""
+echo "Note: After running this script, commit the changes:"
+echo "  git add src/*/lib/common-setup.sh"
+echo "  git commit -m 'Sync common-setup.sh to all features'"

From 35a5d93c482e6c387e01e8b476d7f900ff225506 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 6 Feb 2026 18:14:18 +0000
Subject: [PATCH 12/16] Fix common-utils to restore original user creation
 logic

common-utils has different semantics than other features - it CREATES users rather than just using existing ones. Restored the original inline logic that uses _REMOTE_USER without validation since the user will be created.

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/common-utils/main.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 42a41bc81..95316035f 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -399,10 +399,6 @@ case "${ADJUSTED_ID}" in
         ;;
 esac
 
-# Source common helper functions
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/_lib/common-setup.sh"
-
 # Handle the special "none" case for common-utils before user determination
 # The "none" case sets USER_UID and USER_GID to 0
 ORIGINAL_USERNAME="${USERNAME}"
@@ -410,9 +406,25 @@ if [ "${ORIGINAL_USERNAME}" = "none" ]; then
     USERNAME="root"
     USER_UID=0
     USER_GID=0
-else
+elif [ "${ORIGINAL_USERNAME}" = "auto" ] || [ "${ORIGINAL_USERNAME}" = "automatic" ]; then
     # If in automatic mode, determine if a user already exists, if not use vscode (which will be created)
-    USERNAME=$(determine_user_from_input "${USERNAME}" "vscode")
+    # common-utils has special handling because it CREATES users, not just uses existing ones
+    if [ "${_REMOTE_USER}" != "root" ]; then
+        USERNAME="${_REMOTE_USER}"
+    else
+        # Try to find an existing user, or fall back to "vscode" which we'll create
+        USERNAME=""
+        POSSIBLE_USERS=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
+        for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
+            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+                USERNAME=${CURRENT_USER}
+                break
+            fi
+        done
+        if [ "${USERNAME}" = "" ]; then
+            USERNAME=vscode
+        fi
+    fi
 fi
 # Create or update a non-root user to match UID/GID.
 group_name="${USERNAME}"

From c2f0fbf57e19dc36b0099ba1d127500c6af8a936 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 6 Feb 2026 18:15:35 +0000
Subject: [PATCH 13/16] Update sync script to exclude common-utils (uses inline
 logic)

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 scripts/sync-common-setup.sh          |  2 +-
 src/common-utils/_lib/common-setup.sh | 87 ---------------------------
 2 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 src/common-utils/_lib/common-setup.sh

diff --git a/scripts/sync-common-setup.sh b/scripts/sync-common-setup.sh
index 74f668617..034005bee 100755
--- a/scripts/sync-common-setup.sh
+++ b/scripts/sync-common-setup.sh
@@ -19,9 +19,9 @@ REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 SOURCE_FILE="${REPO_ROOT}/scripts/lib/common-setup.sh"
 
 # Features that use the common-setup helper
+# Note: common-utils is excluded because it creates users (different semantics)
 FEATURES=(
     "anaconda"
-    "common-utils"
     "conda"
     "desktop-lite"
     "docker-in-docker"
diff --git a/src/common-utils/_lib/common-setup.sh b/src/common-utils/_lib/common-setup.sh
deleted file mode 100644
index d2ac866cf..000000000
--- a/src/common-utils/_lib/common-setup.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#-------------------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
-#-------------------------------------------------------------------------------------------------------------------------
-#
-# Helper script for common feature setup tasks, including user selection logic.
-# Maintainer: The Dev Container spec maintainers
-
-# Determine the appropriate non-root user
-# Usage: determine_user_from_input USERNAME [FALLBACK_USER]
-#
-# This function resolves the USERNAME variable based on the input value:
-# - If USERNAME is "auto" or "automatic", it will detect an existing non-root user
-# - If USERNAME is "none" or doesn't exist, it will fall back to root
-# - Otherwise, it validates the specified USERNAME exists
-#
-# Arguments:
-#   USERNAME - The username input (typically from feature configuration)
-#   FALLBACK_USER - Optional fallback user when no user is found in automatic mode (defaults to "root")
-#
-# Returns:
-#   The resolved username is printed to stdout
-#
-# Examples:
-#   USERNAME=$(determine_user_from_input "automatic")
-#   USERNAME=$(determine_user_from_input "vscode")
-#   USERNAME=$(determine_user_from_input "auto" "vscode")
-#
-determine_user_from_input() {
-    local input_username="${1:-automatic}"
-    local fallback_user="${2:-root}"
-    local resolved_username=""
-
-    if [ "${input_username}" = "auto" ] || [ "${input_username}" = "automatic" ]; then
-        # Automatic mode: try to detect an existing non-root user
-        
-        # First, check if _REMOTE_USER is set and is not root
-        if [ -n "${_REMOTE_USER:-}" ] && [ "${_REMOTE_USER}" != "root" ]; then
-            # Verify the user exists before using it
-            if id -u "${_REMOTE_USER}" > /dev/null 2>&1; then
-                resolved_username="${_REMOTE_USER}"
-            else
-                # _REMOTE_USER doesn't exist, fall through to normal detection
-                resolved_username=""
-            fi
-        fi
-        
-        # If we didn't resolve via _REMOTE_USER, try to find a non-root user
-        if [ -z "${resolved_username}" ]; then
-            # Try to find a non-root user from a list of common usernames
-            # The list includes: devcontainer, vscode, node, codespace, and the user with UID 1000
-            local possible_users=("devcontainer" "vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd 2>/dev/null || echo '')")
-            
-            for current_user in "${possible_users[@]}"; do
-                # Skip empty entries
-                if [ -z "${current_user}" ]; then
-                    continue
-                fi
-                
-                # Check if user exists
-                if id -u "${current_user}" > /dev/null 2>&1; then
-                    resolved_username="${current_user}"
-                    break
-                fi
-            done
-            
-            # If no user found, use the fallback
-            if [ -z "${resolved_username}" ]; then
-                resolved_username="${fallback_user}"
-            fi
-        fi
-    elif [ "${input_username}" = "none" ]; then
-        # Explicit "none" means use root
-        resolved_username="root"
-    else
-        # Specific username provided - validate it exists
-        if id -u "${input_username}" > /dev/null 2>&1; then
-            resolved_username="${input_username}"
-        else
-            # User doesn't exist, fall back to root
-            resolved_username="root"
-        fi
-    fi
-
-    echo "${resolved_username}"
-}

From 4e3ccd76cb9b76b7bb9d9c29dc410ae97d125371 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 14:18:19 +0000
Subject: [PATCH 14/16] Fix conda installation failure due to SHA1 signature
 rejection (#1565)

* Initial plan

* Fix conda installation by switching from apt repository to direct Miniconda installer

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Add error handling for Miniconda download and installation

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Use APT::Key::GPGVCommand=1 option to bypass SHA1 signature check

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Fix version to 1.2.1 for semantic versioning

* Revert to Miniconda installer approach - APT option caused gpgv errors

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Use mktemp for secure temporary file creation

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Replace Miniconda installer with direct .deb package download and apt install

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Fix apt-get install syntax and improve error handling

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Fix package filename - use architecture-specific deb and extract Filename from Packages

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Update version to 1.2.3

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Fix apt-get install path - remove ./ prefix for absolute paths

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Fix version matching for specific conda versions - handle version suffixes

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
---
 src/conda/devcontainer-feature.json | 80 ++++++++++++++---------------
 src/conda/install.sh                | 76 +++++++++++++++++++++++----
 2 files changed, 107 insertions(+), 49 deletions(-)

diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 39615464d..cd590f9b7 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,43 +1,43 @@
 {
-    "id": "conda",
-    "version": "1.1.0",
-    "name": "Conda",
-    "description": "A cross-platform, language-agnostic binary package manager",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "4.11.0",
-                "4.12.0"
-            ],
-            "default": "latest",
-            "description": "Select or enter a conda version."
-        },
-        "addCondaForge": {
-            "type": "boolean",
-            "default": false,
-            "description": "Add conda-forge channel to the config?"
-        }
+  "id": "conda",
+  "version": "1.2.5",
+  "name": "Conda",
+  "description": "A cross-platform, language-agnostic binary package manager",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "4.11.0",
+        "4.12.0"
+      ],
+      "default": "latest",
+      "description": "Select or enter a conda version."
     },
-    "containerEnv": {
-        "CONDA_DIR": "/opt/conda",
-        "CONDA_SCRIPT": "/opt/conda/etc/profile.d/conda.sh",
-        "PATH": "/opt/conda/bin:${PATH}"
-    },
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
-                    }
-                ]
-            }
-        }
-    },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "addCondaForge": {
+      "type": "boolean",
+      "default": false,
+      "description": "Add conda-forge channel to the config?"
+    }
+  },
+  "containerEnv": {
+    "CONDA_DIR": "/opt/conda",
+    "CONDA_SCRIPT": "/opt/conda/etc/profile.d/conda.sh",
+    "PATH": "/opt/conda/bin:${PATH}"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 4d1cf2237..ef3b6010f 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -73,20 +73,78 @@ if ! conda --version &> /dev/null ; then
     usermod -a -G conda "${USERNAME}"
 
     # Install dependencies
-    check_packages curl ca-certificates gnupg2
+    check_packages curl ca-certificates
 
     echo "Installing Conda..."
 
-    curl -sS https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > /usr/share/keyrings/conda-archive-keyring.gpg
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" > /etc/apt/sources.list.d/conda.list
-    apt-get update -y
-
-    CONDA_PKG="conda=${VERSION}-0"
+    # Download .deb package directly from repository (bypassing SHA1 signature issue)
+    TEMP_DEB="$(mktemp -t conda_XXXXXX.deb)"
+    CONDA_REPO_BASE="https://repo.anaconda.com/pkgs/misc/debrepo/conda"
+    
+    # Determine package filename based on requested version
+    ARCH="$(dpkg --print-architecture 2>/dev/null || echo "amd64")"
+    PACKAGES_URL="https://repo.anaconda.com/pkgs/misc/debrepo/conda/dists/stable/main/binary-${ARCH}/Packages"
+    
     if [ "${VERSION}" = "latest" ]; then
-        CONDA_PKG="conda"
+        # For latest, we need to query the repository to find the current version
+        echo "Fetching package list to determine latest version..."
+        CONDA_PKG_INFO=$(curl -fsSL "${PACKAGES_URL}" | grep -A 30 "^Package: conda$" | head -n 31)
+        CONDA_VERSION=$(echo "${CONDA_PKG_INFO}" | grep "^Version:" | head -n 1 | awk '{print $2}')
+        CONDA_FILENAME=$(echo "${CONDA_PKG_INFO}" | grep "^Filename:" | head -n 1 | awk '{print $2}')
+        
+        if [ -z "${CONDA_VERSION}" ] || [ -z "${CONDA_FILENAME}" ]; then
+            echo "ERROR: Could not determine latest conda version or filename from ${PACKAGES_URL}"
+            echo "This may indicate an unsupported architecture or repository unavailability."
+            rm -f "${TEMP_DEB}"
+            exit 1
+        fi
+        
+        CONDA_PKG_NAME="${CONDA_FILENAME}"
+    else
+        # For specific versions, query the Packages file to find the exact filename
+        echo "Fetching package list to find version ${VERSION}..."
+        # Search for version pattern - user may specify 4.12.0 but package has 4.12.0-0
+        CONDA_PKG_INFO=$(curl -fsSL "${PACKAGES_URL}" | grep -A 30 "^Package: conda$" | grep -B 5 -A 25 "^Version: ${VERSION}")
+        CONDA_FILENAME=$(echo "${CONDA_PKG_INFO}" | grep "^Filename:" | head -n 1 | awk '{print $2}')
+        
+        if [ -z "${CONDA_FILENAME}" ]; then
+            echo "ERROR: Could not find conda version ${VERSION} in ${PACKAGES_URL}"
+            echo "Please verify the version specified is valid."
+            rm -f "${TEMP_DEB}"
+            exit 1
+        fi
+        
+        CONDA_PKG_NAME="${CONDA_FILENAME}"
     fi
-
-    check_packages $CONDA_PKG
+    
+    # Download the .deb package
+    CONDA_DEB_URL="${CONDA_REPO_BASE}/${CONDA_PKG_NAME}"
+    echo "Downloading conda package from ${CONDA_DEB_URL}..."
+    
+    if ! curl -fsSL "${CONDA_DEB_URL}" -o "${TEMP_DEB}"; then
+        echo "ERROR: Failed to download conda .deb package from ${CONDA_DEB_URL}"
+        echo "Please verify the version specified is valid."
+        rm -f "${TEMP_DEB}"
+        exit 1
+    fi
+    
+    # Verify the package was downloaded successfully
+    if [ ! -f "${TEMP_DEB}" ] || [ ! -s "${TEMP_DEB}" ]; then
+        echo "ERROR: Conda .deb package file is missing or empty"
+        rm -f "${TEMP_DEB}"
+        exit 1
+    fi
+    
+    # Install the package using apt (which handles dependencies automatically)
+    echo "Installing conda package..."
+    if ! apt-get install -y "${TEMP_DEB}"; then
+        echo "ERROR: Failed to install conda package"
+        rm -f "${TEMP_DEB}"
+        exit 1
+    fi
+    
+    # Clean up downloaded package
+    rm -f "${TEMP_DEB}"
 
     CONDA_SCRIPT="/opt/conda/etc/profile.d/conda.sh"
     . $CONDA_SCRIPT

From 04284149dd4618bb19a7ffadaa943503db02a3bf Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 17:15:59 +0000
Subject: [PATCH 15/16] Fix kubectl-helm-minikube installation failures on
 debian:11 and ubuntu:focal (#1567)

* Initial plan

* Fix kubectl SHA256 download URL and bump version to 1.3.1

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Add timeout and fallback for kubectl version fetching

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Improve error messages and diagnostics for kubectl version fetching

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Address code review feedback: clean up error handling

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Improve error message to reference VERSION option

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Use hardcoded fallback version instead of git tags fallback

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Add version validation and comment for fallback version

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Extract fallback version to constant at top of file

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Update fallback version of kubectl to v1.35.1

* Add alternative URL fallback before using hardcoded version

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 .../devcontainer-feature.json                 | 114 +++++++++---------
 src/kubectl-helm-minikube/install.sh          |  15 ++-
 2 files changed, 70 insertions(+), 59 deletions(-)

diff --git a/src/kubectl-helm-minikube/devcontainer-feature.json b/src/kubectl-helm-minikube/devcontainer-feature.json
index 36bf33b19..af8dc739e 100644
--- a/src/kubectl-helm-minikube/devcontainer-feature.json
+++ b/src/kubectl-helm-minikube/devcontainer-feature.json
@@ -1,61 +1,61 @@
 {
-    "id": "kubectl-helm-minikube",
-    "version": "1.3.0",
-    "name": "Kubectl, Helm, and Minikube",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
-    "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "1.23",
-                "1.22",
-                "1.21",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Kubernetes version to install"
-        },
-        "helm": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Helm version to install"
-        },
-        "minikube": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Minikube version to install"
-        }
+  "id": "kubectl-helm-minikube",
+  "version": "1.3.1",
+  "name": "Kubectl, Helm, and Minikube",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/kubectl-helm-minikube",
+  "description": "Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects latest versions and installs needed dependencies.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "1.23",
+        "1.22",
+        "1.21",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Kubernetes version to install"
     },
-    "mounts": [
-        {
-            "source": "minikube-config",
-            "target": "/home/vscode/.minikube",
-            "type": "volume"
-        }
-    ],
-    "customizations": {
-        "vscode": {
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
-                    }
-                ]
-            }
-        }
+    "helm": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Helm version to install"
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "minikube": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Minikube version to install"
+    }
+  },
+  "mounts": [
+    {
+      "source": "minikube-config",
+      "target": "/home/vscode/.minikube",
+      "type": "volume"
+    }
+  ],
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes kubectl, Helm, optionally minikube, and needed dependencies pre-installed and available on the `PATH`. When configuring Ingress for your Kubernetes cluster, note that by default Kubernetes will bind to a specific interface's IP rather than localhost or all interfaces. This is why you need to use the Kubernetes Node's IP when connecting - even if there's only one Node as in the case of Minikube."
+          }
+        ]
+      }
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/kubectl-helm-minikube/install.sh b/src/kubectl-helm-minikube/install.sh
index ce97193d1..d4d947c56 100755
--- a/src/kubectl-helm-minikube/install.sh
+++ b/src/kubectl-helm-minikube/install.sh
@@ -12,6 +12,9 @@ set -e
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
+# Fallback version when stable.txt cannot be fetched (updated: 2026-02)
+KUBECTL_FALLBACK_VERSION="v1.35.1"
+
 KUBECTL_VERSION="${VERSION:-"latest"}"
 HELM_VERSION="${HELM:-"latest"}"
 MINIKUBE_VERSION="${MINIKUBE:-"latest"}" # latest is also valid
@@ -154,7 +157,15 @@ if [ ${KUBECTL_VERSION} != "none" ]; then
     # Install the kubectl, verify checksum
     echo "Downloading kubectl..."
     if [ "${KUBECTL_VERSION}" = "latest" ] || [ "${KUBECTL_VERSION}" = "lts" ] || [ "${KUBECTL_VERSION}" = "current" ] || [ "${KUBECTL_VERSION}" = "stable" ]; then
-        KUBECTL_VERSION="$(curl -sSL https://dl.k8s.io/release/stable.txt)"
+        KUBECTL_VERSION="$(curl -fsSL --connect-timeout 10 --max-time 30 https://dl.k8s.io/release/stable.txt 2>/dev/null | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' || echo "")"
+        if [ -z "${KUBECTL_VERSION}" ]; then
+            echo "(!) Failed to fetch kubectl stable version from dl.k8s.io, trying alternative URL..."
+            KUBECTL_VERSION="$(curl -fsSL --connect-timeout 10 --max-time 30 https://storage.googleapis.com/kubernetes-release/release/stable.txt 2>/dev/null | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+' || echo "")"
+        fi
+        if [ -z "${KUBECTL_VERSION}" ]; then
+            echo "(!) Failed to fetch kubectl stable version from both URLs. Using fallback version ${KUBECTL_FALLBACK_VERSION}"
+            KUBECTL_VERSION="${KUBECTL_FALLBACK_VERSION}"
+        fi
     else
         find_version_from_git_tags KUBECTL_VERSION https://github.com/kubernetes/kubernetes
     fi
@@ -164,7 +175,7 @@ if [ ${KUBECTL_VERSION} != "none" ]; then
     curl -sSL -o /usr/local/bin/kubectl "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${architecture}/kubectl"
     chmod 0755 /usr/local/bin/kubectl
     if [ "$KUBECTL_SHA256" = "automatic" ]; then
-        KUBECTL_SHA256="$(curl -sSL "https://dl.k8s.io/${KUBECTL_VERSION}/bin/linux/${architecture}/kubectl.sha256")"
+        KUBECTL_SHA256="$(curl -sSL "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/${architecture}/kubectl.sha256")"
     fi
     ([ "${KUBECTL_SHA256}" = "dev-mode" ] || (echo "${KUBECTL_SHA256} */usr/local/bin/kubectl" | sha256sum -c -))
     if ! type kubectl > /dev/null 2>&1; then

From 3f0dee2805d816344c1f7291aee483e5b6fc5208 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Wed, 11 Feb 2026 17:44:41 +0000
Subject: [PATCH 16/16] Fix certificate verification for Ubuntu 24.04/Debian
 Trixie in docker features (#1569)

* Initial plan

* Add update-ca-certificates call after installing ca-certificates package

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Bump feature versions: docker-outside-of-docker to 1.8.0, docker-in-docker to 2.16.0

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Add error handling and documentation for update-ca-certificates calls

Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>

* Remove invalid test for docker-compose when v2 isn't installed

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: abdurriq <137001048+abdurriq@users.noreply.github.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurriq@github.com>
---
 .../devcontainer-feature.json                 | 178 +++++++++---------
 src/docker-in-docker/install.sh               |   7 +
 .../devcontainer-feature.json                 | 152 +++++++--------
 src/docker-outside-of-docker/install.sh       |   5 +
 .../docker_dash_compose_v1.sh                 |   1 -
 5 files changed, 177 insertions(+), 166 deletions(-)

diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index 0cd4f1458..48d807552 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -1,94 +1,94 @@
 {
-    "id": "docker-in-docker",
-    "version": "2.15.0",
-    "name": "Docker (Docker-in-Docker)",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
-    "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "20.10"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
-        },
-        "moby": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install OSS Moby build instead of Docker CE"
-        },
-        "mobyBuildxVersion": {
-            "type": "string",
-            "default": "latest",
-            "description": "Install a specific version of moby-buildx when using Moby"
-        },
-        "dockerDashComposeVersion": {
-            "type": "string",
-            "enum": [
-                "none",
-                "v1",
-                "v2"
-            ],
-            "default": "v2",
-            "description": "Default version of Docker Compose (v1, v2 or none)"
-        },
-        "azureDnsAutoDetection": {
-            "type": "boolean",
-            "default": true,
-            "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
-        },
-        "dockerDefaultAddressPool": {
-            "type": "string",
-            "default": "",
-            "proposals": [],
-            "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
-        },
-        "installDockerBuildx": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Docker Buildx"
-        },
-        "installDockerComposeSwitch": {
-            "type": "boolean",
-            "default": false,
-            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-        },
-        "disableIp6tables": {
-            "type": "boolean",
-            "default": false,
-            "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
-        }
+  "id": "docker-in-docker",
+  "version": "2.16.0",
+  "name": "Docker (Docker-in-Docker)",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-in-docker",
+  "description": "Create child containers *inside* a container, independent from the host's docker instance. Installs Docker extension in the container along with needed CLIs.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "20.10"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Docker/Moby Engine version. (Availability can vary by OS version.)"
     },
-    "entrypoint": "/usr/local/share/docker-init.sh",
-    "privileged": true,
-    "containerEnv": {
-        "DOCKER_BUILDKIT": "1"
+    "moby": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install OSS Moby build instead of Docker CE"
     },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-azuretools.vscode-containers"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
-                    }
-                ]
-            }
-        }
+    "mobyBuildxVersion": {
+      "type": "string",
+      "default": "latest",
+      "description": "Install a specific version of moby-buildx when using Moby"
     },
-    "mounts": [
-        {
-            "source": "dind-var-lib-docker-${devcontainerId}",
-            "target": "/var/lib/docker",
-            "type": "volume"
-        }
-    ],
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ]
+    "dockerDashComposeVersion": {
+      "type": "string",
+      "enum": [
+        "none",
+        "v1",
+        "v2"
+      ],
+      "default": "v2",
+      "description": "Default version of Docker Compose (v1, v2 or none)"
+    },
+    "azureDnsAutoDetection": {
+      "type": "boolean",
+      "default": true,
+      "description": "Allow automatically setting the dockerd DNS server when the installation script detects it is running in Azure"
+    },
+    "dockerDefaultAddressPool": {
+      "type": "string",
+      "default": "",
+      "proposals": [],
+      "description": "Define default address pools for Docker networks. e.g. base=192.168.0.0/16,size=24"
+    },
+    "installDockerBuildx": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Docker Buildx"
+    },
+    "installDockerComposeSwitch": {
+      "type": "boolean",
+      "default": false,
+      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+    },
+    "disableIp6tables": {
+      "type": "boolean",
+      "default": false,
+      "description": "Disable ip6tables (this option is only applicable for Docker versions 27 and greater)"
+    }
+  },
+  "entrypoint": "/usr/local/share/docker-init.sh",
+  "privileged": true,
+  "containerEnv": {
+    "DOCKER_BUILDKIT": "1"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azuretools.vscode-containers"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using a dedicated Docker daemon running inside the dev container."
+          }
+        ]
+      }
+    }
+  },
+  "mounts": [
+    {
+      "source": "dind-var-lib-docker-${devcontainerId}",
+      "target": "/var/lib/docker",
+      "type": "volume"
+    }
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ]
 }
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index e484e40a2..de6aa872d 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -293,6 +293,13 @@ if ! command -v git >/dev/null 2>&1; then
     check_packages git
 fi
 
+# Update CA certificates to ensure HTTPS connections work properly
+# This is especially important for Ubuntu 24.04 (Noble) and Debian Trixie
+# Only run for Debian-based systems (RHEL uses update-ca-trust instead)
+if [ "${ADJUSTED_ID}" = "debian" ] && command -v update-ca-certificates > /dev/null 2>&1; then
+    update-ca-certificates
+fi
+
 # Swap to legacy iptables for compatibility (Debian only)
 if [ "${ADJUSTED_ID}" = "debian" ] && type iptables-legacy > /dev/null 2>&1; then
     update-alternatives --set iptables /usr/sbin/iptables-legacy
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
index d191d9443..d0039a843 100644
--- a/src/docker-outside-of-docker/devcontainer-feature.json
+++ b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,80 +1,80 @@
 {
-    "id": "docker-outside-of-docker",
-    "version": "1.7.0",
-    "name": "Docker (docker-outside-of-docker)",
-    "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
-    "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "none",
-                "20.10"
-            ],
-            "default": "latest",
-            "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
-        },
-        "moby": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install OSS Moby build instead of Docker CE"
-        },
-        "mobyBuildxVersion": {
-            "type": "string",
-            "default": "latest",
-            "description": "Install a specific version of moby-buildx when using Moby"
-        },
-        "dockerDashComposeVersion": {
-            "type": "string",
-            "enum": [
-                "none",
-                "v1",
-                "v2"
-            ],
-            "default": "v2",
-            "description": "Compose version to use for docker-compose (v1 or v2 or none)"
-        },
-        "installDockerBuildx": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Docker Buildx"
-        },
-        "installDockerComposeSwitch": {
-            "type": "boolean",
-            "default": true,
-            "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
-        }
+  "id": "docker-outside-of-docker",
+  "version": "1.8.0",
+  "name": "Docker (docker-outside-of-docker)",
+  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
+  "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": [
+        "latest",
+        "none",
+        "20.10"
+      ],
+      "default": "latest",
+      "description": "Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.)"
     },
-    "entrypoint": "/usr/local/share/docker-init.sh",
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-azuretools.vscode-containers"
-            ],
-            "settings": {
-                "github.copilot.chat.codeGeneration.instructions": [
-                    {
-                        "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
-                    }
-                ]
-            }
-        }
+    "moby": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install OSS Moby build instead of Docker CE"
     },
-    "mounts": [
-        {
-            "source": "/var/run/docker.sock",
-            "target": "/var/run/docker-host.sock",
-            "type": "bind"
-        }
-    ],
-    "securityOpt": [
-        "label=disable"
-    ],
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils"
-    ],
-    "legacyIds": [
-        "docker-from-docker"
-    ]
+    "mobyBuildxVersion": {
+      "type": "string",
+      "default": "latest",
+      "description": "Install a specific version of moby-buildx when using Moby"
+    },
+    "dockerDashComposeVersion": {
+      "type": "string",
+      "enum": [
+        "none",
+        "v1",
+        "v2"
+      ],
+      "default": "v2",
+      "description": "Compose version to use for docker-compose (v1 or v2 or none)"
+    },
+    "installDockerBuildx": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Docker Buildx"
+    },
+    "installDockerComposeSwitch": {
+      "type": "boolean",
+      "default": true,
+      "description": "Install Compose Switch (provided docker compose is available) which is a replacement to the Compose V1 docker-compose (python) executable. It translates the command line into Compose V2 docker compose then runs the latter."
+    }
+  },
+  "entrypoint": "/usr/local/share/docker-init.sh",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-azuretools.vscode-containers"
+      ],
+      "settings": {
+        "github.copilot.chat.codeGeneration.instructions": [
+          {
+            "text": "This dev container includes the Docker CLI (`docker`) pre-installed and available on the `PATH` for running and managing containers using the Docker daemon on the host machine."
+          }
+        ]
+      }
+    }
+  },
+  "mounts": [
+    {
+      "source": "/var/run/docker.sock",
+      "target": "/var/run/docker-host.sock",
+      "type": "bind"
+    }
+  ],
+  "securityOpt": [
+    "label=disable"
+  ],
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils"
+  ],
+  "legacyIds": [
+    "docker-from-docker"
+  ]
 }
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
index 1b555b522..8849e0dde 100755
--- a/src/docker-outside-of-docker/install.sh
+++ b/src/docker-outside-of-docker/install.sh
@@ -182,6 +182,11 @@ export DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
 check_packages apt-transport-https curl ca-certificates gnupg2 dirmngr wget
+# Update CA certificates to ensure HTTPS connections work properly
+# This is especially important for Ubuntu 24.04 (Noble) and Debian Trixie
+if command -v update-ca-certificates > /dev/null 2>&1; then
+    update-ca-certificates
+fi
 if ! type git > /dev/null 2>&1; then
     check_packages git
 fi
diff --git a/test/docker-outside-of-docker/docker_dash_compose_v1.sh b/test/docker-outside-of-docker/docker_dash_compose_v1.sh
index d95f3cf73..4ae7a9e02 100755
--- a/test/docker-outside-of-docker/docker_dash_compose_v1.sh
+++ b/test/docker-outside-of-docker/docker_dash_compose_v1.sh
@@ -6,7 +6,6 @@ set -e
 source dev-container-features-test-lib
 
 # Definition specific tests
-check "docker compose" bash -c "docker compose version | grep -E '2.[0-9]+.[0-9]+'"
 check "docker-compose" bash -c "docker-compose --version | grep -E '1.[0-9]+.[0-9]+'"
 
 # Report result