diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3fb1bf42e44..612b99fdcdd 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,6 +3,7 @@
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "nextclouddev",
 	"postCreateCommand": ".devcontainer/setup.sh",
+	"postStartCommand": ".devcontainer/postStart.sh",
 	"forwardPorts": [
 		80,
 		8080,
diff --git a/.devcontainer/postStart.sh b/.devcontainer/postStart.sh
new file mode 100755
index 00000000000..20657a15a94
--- /dev/null
+++ b/.devcontainer/postStart.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Set git safe.directory
+git config --global --add safe.directory /var/www/html
+git config --global --add safe.directory /var/www/html/3rdparty
\ No newline at end of file
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
index 3485d4f7257..11bee7175b7 100755
--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -3,10 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
 
 cd $DIR/
 
-# Set git safe.directory
-git config --global --add safe.directory /var/www/html
-git config --global --add safe.directory /var/www/html/3rdparty
-
 git submodule update --init
 
 # Codespace config