diff --git a/devcontainers-cli-0.16.0.tgz b/devcontainers-cli-0.16.0.tgz
new file mode 100644
index 0000000..94479a2
Binary files /dev/null and b/devcontainers-cli-0.16.0.tgz differ
diff --git a/src/docker-from-docker/devcontainer-feature.json b/src/docker-from-docker/devcontainer-feature.json
index 119ef3a..534c130 100644
--- a/src/docker-from-docker/devcontainer-feature.json
+++ b/src/docker-from-docker/devcontainer-feature.json
@@ -28,6 +28,22 @@
             ],
             "default": "v1",
             "description": "Compose version to use for docker-compose (v1 or v2)"
+        },
+        "enableNonRootDocker": {
+            "type": "boolean",
+            "default": true,
+            "description": "Enable non-root Docker access in container"
+        },
+        "username": {
+            "type": "string",
+            "proposals": [
+                "vscode",
+                "codespace",
+                "none",
+                "automatic"
+            ],
+            "default": "automatic",
+            "description": "Enter name of non-root user to configure or none to skip"
         }
     },
     "entrypoint": "/usr/local/share/docker-init.sh",
diff --git a/src/docker-from-docker/install.sh b/src/docker-from-docker/install.sh
index 312e283..bdc3e3b 100755
--- a/src/docker-from-docker/install.sh
+++ b/src/docker-from-docker/install.sh
@@ -10,11 +10,11 @@
 DOCKER_VERSION=${VERSION:-"latest"}
 USE_MOBY=${MOBY:-"true"}
 DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2
+USERNAME=${USERNAME}
 
-ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"}
+ENABLE_NONROOT_DOCKER=${ENABLENONROOTDOCKER}
 SOURCE_SOCKET=${SOURCE_SOCKET:-"/var/run/docker-host.sock"}
 TARGET_SOCKET=${TARGET_SOCKET:-"/var/run/docker.sock"}
-USERNAME=${USERNAME:-"automatic"}
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"
diff --git a/src/docker-in-docker/devcontainer-feature.json b/src/docker-in-docker/devcontainer-feature.json
index ea8a6df..86e2b04 100644
--- a/src/docker-in-docker/devcontainer-feature.json
+++ b/src/docker-in-docker/devcontainer-feature.json
@@ -28,6 +28,22 @@
             ],
             "default": "v1",
             "description": "Default version of Docker Compose (v1 or v2)"
+        },
+        "enableNonRootDocker": {
+            "type": "boolean",
+            "default": true,
+            "description": "Enable non-root Docker access in container"
+        },
+        "username": {
+            "type": "string",
+            "proposals": [
+                "vscode",
+                "codespace",
+                "none",
+                "automatic"
+            ],
+            "default": "automatic",
+            "description": "Enter name of non-root user to configure or none to skip"
         }
     },
     "entrypoint": "/usr/local/share/docker-init.sh",
diff --git a/src/docker-in-docker/install.sh b/src/docker-in-docker/install.sh
index a67aaba..cfc78bc 100755
--- a/src/docker-in-docker/install.sh
+++ b/src/docker-in-docker/install.sh
@@ -12,8 +12,8 @@ DOCKER_VERSION=${VERSION:-"latest"} # The Docker/Moby Engine + CLI should match
 USE_MOBY=${MOBY:-"true"}
 DOCKER_DASH_COMPOSE_VERSION=${DOCKERDASHCOMPOSEVERSION:-"v1"} # v1 or v2
 
-ENABLE_NONROOT_DOCKER=${ENABLE_NONROOT_DOCKER:-"true"}
-USERNAME=${USERNAME:-"automatic"}
+ENABLE_NONROOT_DOCKER=${ENABLENONROOTDOCKER}
+USERNAME=${USERNAME}
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
 DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="buster bullseye bionic focal jammy"