diff --git a/.devcontainer/container_post_create.sh b/.devcontainer/container_post_create.sh
index 639b6efc09..b6202b3cbd 100755
--- a/.devcontainer/container_post_create.sh
+++ b/.devcontainer/container_post_create.sh
@@ -18,3 +18,4 @@ fi
 # that were running as root and therefore had their caches written as root
 sudo chown -R $TARGET_USER: /tmp/scons_cache
 sudo chown -R $TARGET_USER: /tmp/comma_download_cache
+sudo chown -R $TARGET_USER: /home/batman/.comma
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 2519b821a0..ae5a372f2b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -31,7 +31,7 @@
       "username": "batman"
     }
   },
-  "containerUser": "root",
+  "containerUser": "batman",
   "remoteUser": "batman",
   "customizations": {
     "vscode": {
diff --git a/.github/workflows/tools_tests.yaml b/.github/workflows/tools_tests.yaml
index 73d43e24b2..218d2c802d 100644
--- a/.github/workflows/tools_tests.yaml
+++ b/.github/workflows/tools_tests.yaml
@@ -105,3 +105,4 @@ jobs:
       run: |
         devcontainer exec --workspace-folder . scons -j$(nproc)
         devcontainer exec --workspace-folder . pip install pip-install-test
+        devcontainer exec --workspace-folder . touch /home/batman/.comma/auth.json
\ No newline at end of file