diff --git a/src/docker-in-docker/.devcontainer/devcontainer.json b/src/docker-in-docker/.devcontainer/devcontainer.json
index e46dd406..b657c55e 100644
--- a/src/docker-in-docker/.devcontainer/devcontainer.json
+++ b/src/docker-in-docker/.devcontainer/devcontainer.json
@@ -8,7 +8,6 @@
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {
 			"version": "${templateOption:dockerVersion}",
-			"enableNonRootDocker": "${templateOption:enableNonRootDocker}",
 			"moby": "${templateOption:moby}"
 		}
 	}
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index 4461a8e4..896d72fc 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -11,7 +11,6 @@ Create child containers _inside_ a container, independent from the host's docker
 | upgradePackages | Upgrade OS packages? | boolean | false |
 | dockerVersion | Select or enter a Docker/Moby CLI version. (Availability can vary by OS version.) | string | latest |
 | moby | Install OSS Moby build instead of Docker CE | boolean | true |
-| enableNonRootDocker | Enable non-root user to access Docker in container? | boolean | true |
 
 ## Using this template
 
diff --git a/src/docker-in-docker/devcontainer-template.json b/src/docker-in-docker/devcontainer-template.json
index e3a132bd..8c3f6242 100644
--- a/src/docker-in-docker/devcontainer-template.json
+++ b/src/docker-in-docker/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-in-docker",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "name": "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.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/docker-in-docker",
@@ -31,11 +31,6 @@
             "type": "boolean",
             "default": "true",
             "description": "Install OSS Moby build instead of Docker CE"
-        },
-        "enableNonRootDocker": {
-            "type": "boolean",
-            "description": "Enable non-root user to access Docker in container?",
-            "default": "true"
         }
     },
     "platforms": ["Any"],
diff --git a/src/kubernetes-helm-minikube/.devcontainer/devcontainer.json b/src/kubernetes-helm-minikube/.devcontainer/devcontainer.json
index 0047d293..bafcf69e 100644
--- a/src/kubernetes-helm-minikube/.devcontainer/devcontainer.json
+++ b/src/kubernetes-helm-minikube/.devcontainer/devcontainer.json
@@ -7,7 +7,6 @@
 
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {
-			"enableNonRootDocker": "true",
 			"moby": "true"
 		},
 		"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
diff --git a/src/kubernetes-helm-minikube/devcontainer-template.json b/src/kubernetes-helm-minikube/devcontainer-template.json
index cad61a3a..9f5f45c0 100644
--- a/src/kubernetes-helm-minikube/devcontainer-template.json
+++ b/src/kubernetes-helm-minikube/devcontainer-template.json
@@ -1,6 +1,6 @@
 {
     "id": "kubernetes-helm-minikube",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "name": "Kubernetes - Minikube-in-Docker",
     "description": "Access an embedded minikube instance from inside a dev container. Includes kubectl, Helm, minikube, and the Docker.",
     "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/kubernetes-helm-minikube",
diff --git a/test/kubernetes-helm-minikube/test.sh b/test/kubernetes-helm-minikube/test.sh
index bbcbd484..5e2efa4a 100755
--- a/test/kubernetes-helm-minikube/test.sh
+++ b/test/kubernetes-helm-minikube/test.sh
@@ -11,7 +11,7 @@ checkExtension "ms-azuretools.vscode-docker"
 checkExtension "ms-kubernetes-tools.vscode-kubernetes-tools"
 check "docker" docker ps -a
 check "kubectl" kubectl version --client
-check "helm" helm version --client
+check "helm" helm version --short
 check "minikube start" minikube start
 check "minikube remove" minikube delete
 docker image prune -a -f