diff --git a/.cc/{{cookiecutter.__demo_slug}}/containers/{{cookiecutter.__demo_slug}}/.devcontainer/postCreate.sh.jinja b/.cc/{{cookiecutter.__demo_slug}}/containers/{{cookiecutter.__demo_slug}}/.devcontainer/postCreate.sh.jinja
index 27d3c17..f6d190b 100644
--- a/.cc/{{cookiecutter.__demo_slug}}/containers/{{cookiecutter.__demo_slug}}/.devcontainer/postCreate.sh.jinja
+++ b/.cc/{{cookiecutter.__demo_slug}}/containers/{{cookiecutter.__demo_slug}}/.devcontainer/postCreate.sh.jinja
@@ -14,6 +14,7 @@ ardl get eos --image-type cEOS --version ${CEOS_LAB_VERSION}  --import-docker
 # init demo dir as Git repo if requested for this demo env
 if ${GIT_INIT}; then
   cd ${CONTAINERWSF}
+  git config --global --add safe.directory .
   git init
   git add .
   git commit -m "git init"
diff --git a/containers/avd-avd-extended-workshop--part-1/.devcontainer/postCreate.sh b/containers/avd-avd-extended-workshop--part-1/.devcontainer/postCreate.sh
index 6ac5276..0ab3cf5 100644
--- a/containers/avd-avd-extended-workshop--part-1/.devcontainer/postCreate.sh
+++ b/containers/avd-avd-extended-workshop--part-1/.devcontainer/postCreate.sh
@@ -14,6 +14,7 @@ ardl get eos --image-type cEOS --version ${CEOS_LAB_VERSION}  --import-docker
 # init demo dir as Git repo if requested for this demo env
 if ${GIT_INIT}; then
   cd ${CONTAINERWSF}
+  git config --global --add safe.directory .
   git init
   git add .
   git commit -m "git init"
diff --git a/containers/clab-build-containerlab-with-ceos/.devcontainer/postCreate.sh b/containers/clab-build-containerlab-with-ceos/.devcontainer/postCreate.sh
index aad11be..11ceb3a 100644
--- a/containers/clab-build-containerlab-with-ceos/.devcontainer/postCreate.sh
+++ b/containers/clab-build-containerlab-with-ceos/.devcontainer/postCreate.sh
@@ -12,6 +12,7 @@ ardl get eos --image-type cEOS --version ${CEOS_LAB_VERSION}  --import-docker
 # init demo dir as Git repo if requested for this demo env
 if ${GIT_INIT}; then
   cd ${CONTAINERWSF}
+  git config --global --add safe.directory .
   git init
   git add .
   git commit -m "git init"
diff --git a/containers/cvaas-cvaas-and-avd-demo--evpn-aa/.devcontainer/postCreate.sh b/containers/cvaas-cvaas-and-avd-demo--evpn-aa/.devcontainer/postCreate.sh
index 6ac5276..0ab3cf5 100644
--- a/containers/cvaas-cvaas-and-avd-demo--evpn-aa/.devcontainer/postCreate.sh
+++ b/containers/cvaas-cvaas-and-avd-demo--evpn-aa/.devcontainer/postCreate.sh
@@ -14,6 +14,7 @@ ardl get eos --image-type cEOS --version ${CEOS_LAB_VERSION}  --import-docker
 # init demo dir as Git repo if requested for this demo env
 if ${GIT_INIT}; then
   cd ${CONTAINERWSF}
+  git config --global --add safe.directory .
   git init
   git add .
   git commit -m "git init"
diff --git a/containers/cvaas-cvaas-and-avd-demo--evpn-mlag/.devcontainer/postCreate.sh b/containers/cvaas-cvaas-and-avd-demo--evpn-mlag/.devcontainer/postCreate.sh
index 6ac5276..0ab3cf5 100644
--- a/containers/cvaas-cvaas-and-avd-demo--evpn-mlag/.devcontainer/postCreate.sh
+++ b/containers/cvaas-cvaas-and-avd-demo--evpn-mlag/.devcontainer/postCreate.sh
@@ -14,6 +14,7 @@ ardl get eos --image-type cEOS --version ${CEOS_LAB_VERSION}  --import-docker
 # init demo dir as Git repo if requested for this demo env
 if ${GIT_INIT}; then
   cd ${CONTAINERWSF}
+  git config --global --add safe.directory .
   git init
   git add .
   git commit -m "git init"