diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c534dc97..24b231d9 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -11,7 +11,7 @@
 	"mounts": [
 		"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
 	],
-	"postCreateCommand": "bash .devcontainer/post-create.sh",
+	"postStartCommand": "sh .devcontainer/post_start.sh",
 	"customizations": {
 		"vscode": {
 			"extensions": [
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
deleted file mode 100644
index 9196f7ba..00000000
--- a/.devcontainer/post-create.sh
+++ /dev/null
@@ -1 +0,0 @@
-rm ~/.docker/config.json
diff --git a/.devcontainer/post_start.sh b/.devcontainer/post_start.sh
new file mode 100644
index 00000000..8d09393d
--- /dev/null
+++ b/.devcontainer/post_start.sh
@@ -0,0 +1,2 @@
+git config --global --add safe.directory /workspaces/substation
+rm -f ~/.docker/config.json
diff --git a/README.md b/README.md
index 644b9ece..c7ccca08 100644
--- a/README.md
+++ b/README.md
@@ -50,14 +50,14 @@ docker run -v $(pwd):/workspaces/substation/  -w /workspaces/substation -v /var/
 
 To try the system locally, run this from the [examples](examples) directory:
 ```sh
-git config --global --add safe.directory /workspaces/substation && \
+sh .devcontainer/post_start.sh && \
 cd examples && \
 make -s quickstart
 ```
 
 To try the system in the cloud, choose an [AWS example](examples/terraform/aws) to deploy:
 ```sh
-git config --global --add safe.directory /workspaces/substation && \
+sh .devcontainer/post_start.sh && \
 cd examples && \
 aws configure && \
 make -s check && \