diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 62e90add..dfea5bef 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,7 @@
 {
     "name": "R-Dev-Env",
     "image": "ghcr.io/r-devel/r-dev-env:devel",
+    "remoteUser": "vscode",
     "hostRequirements": {
         "cpus": 4
     },
@@ -47,5 +48,5 @@
             ]
         }
     },
-    "postCreateCommand": "find . -wholename '*.git*'  -type d -prune -o -type f -exec chown vscode:vscode {} \\; && sh /workspaces/r-dev-env/scripts/localscript.sh"
+    "postCreateCommand": "sh /workspaces/r-dev-env/scripts/localscript.sh"
 }
diff --git a/Dockerfile b/Dockerfile
index 458876b1..5b88fee2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,3 +30,5 @@ RUN Rscript -e "runiverse <- sprintf('r-universe.dev/bin/linux/%s-%s/%s/', \
 # Define env var used in GitHub Actions that build and deploy container
 ARG CONTAINER_VERSION
 ENV CONTAINER_VERSION=${CONTAINER_VERSION}
+
+USER vscode