diff --git a/.devcontainer/cache/restore-diff.sh b/.devcontainer/cache/restore-diff.sh
index cec5950fad5c2..e8ea93f3f3543 100755
--- a/.devcontainer/cache/restore-diff.sh
+++ b/.devcontainer/cache/restore-diff.sh
@@ -22,3 +22,8 @@ echo "+1000 +$(id -g)" > "${CACHE_FOLDER}/cache-group-map"
 tar --owner-map="${CACHE_FOLDER}/cache-owner-map" --group-map="${CACHE_FOLDER}/cache-group-map" -xpsf "${CACHE_FOLDER}/cache.tar"
 rm -rf "${CACHE_FOLDER}"
 echo "[$(date)] Done!"
+
+# Change ownership of chrome-sandbox
+sudo chown root .build/electron/chrome-sandbox
+sudo chmod 4755 .build/electron/chrome-sandbox
+
diff --git a/.devcontainer/prepare.sh b/.devcontainer/prepare.sh
index d6f1578c3dda3..9b5c81ff40dfa 100755
--- a/.devcontainer/prepare.sh
+++ b/.devcontainer/prepare.sh
@@ -7,6 +7,3 @@
 
 yarn install
 yarn electron
-
-sudo chown root .build/electron/chrome-sandbox
-sudo chmod 4755  .build/electron/chrome-sandbox