diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2c10762496..0e5e97316d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,8 +3,8 @@ FROM ghcr.io/commaai/openpilot-base:latest
 RUN apt update && apt install -y vim net-tools usbutils htop ripgrep tmux
 RUN pip install ipython jupyter jupyterlab
 
+USER batman
+
 RUN cd $HOME && \
     curl -O https://raw.githubusercontent.com/commaai/agnos-builder/master/userspace/home/.tmux.conf && \
-    curl -O https://github.com/commaai/agnos-builder/blob/master/userspace/home/.vimrc
-
-ENV CARLA_HOST="host.docker.internal"
\ No newline at end of file
+    curl -O https://raw.githubusercontent.com/commaai/agnos-builder/master/userspace/home/.vimrc
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4f8097e324..2519b821a0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -11,6 +11,7 @@
     "DISPLAY": "${localEnv:DISPLAY}",
     "PYTHONPATH": "${containerWorkspaceFolder}",
     "TERM": "xterm-256color",
+    "CARLA_HOST": "host.docker.internal",
     "force_color_prompt": "1"
   },
   "runArgs": [