diff --git a/.devcontainer/cache/cache.Dockerfile b/.devcontainer/cache/cache.Dockerfile
index 480019b161747..217122a4e9b95 100644
--- a/.devcontainer/cache/cache.Dockerfile
+++ b/.devcontainer/cache/cache.Dockerfile
@@ -18,5 +18,7 @@ RUN mkdir -p ${CACHE_FOLDER} && chown ${USERNAME} ${CACHE_FOLDER} /repo-source-t
 FROM mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:dev as dev-container
 ARG USERNAME=node
 ARG CACHE_FOLDER="/home/${USERNAME}/.devcontainer-cache"
-RUN mkdir -p "${CACHE_FOLDER}" && chown "${USERNAME}:${USERNAME}" "${CACHE_FOLDER}"
+RUN mkdir -p "${CACHE_FOLDER}" \
+	&& chown "${USERNAME}:${USERNAME}" "${CACHE_FOLDER}" \
+	&& su ${USERNAME} -c "git config --global codespaces-theme.hide-status 1"
 COPY --from=cache ${CACHE_FOLDER}/cache.tar ${CACHE_FOLDER}/
diff --git a/.devcontainer/prepare.sh b/.devcontainer/prepare.sh
index ee7e79f5bbf88..d6f1578c3dda3 100755
--- a/.devcontainer/prepare.sh
+++ b/.devcontainer/prepare.sh
@@ -5,13 +5,8 @@
 # running commands like "yarn install" from the ground up. Developers (and should) still run these commands
 # after the actual dev container is created, but only differences will be processed.
 
-# Fix permissions for chrome sandboxing
-mkdir -p .build/electron/chrome-sandbox
-chmod 4755  .build/electron/chrome-sandbox
-chown root .build/electron/chrome-sandbox
-
 yarn install
 yarn electron
 
-# Improve command line lag by disabling git portion of theme
-git config --global codespaces-theme.hide-status 1
+sudo chown root .build/electron/chrome-sandbox
+sudo chmod 4755  .build/electron/chrome-sandbox