diff --git a/run/scripts/run b/run/scripts/run
index 8eea159115267329d54135c882b6fdbbb54491ff..899093b4dc4850e3f9f002baccf84760cd8dd557 100755
--- a/run/scripts/run
+++ b/run/scripts/run
@@ -10,4 +10,4 @@ if [[ -n "$1" ]]; then
   fi
 fi
 
-/usr/local/bin/${COMMAND} $@
+/usr/local/bin/${COMMAND} "$@"
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 03ba4fb136cb8aba2118a3a7b7c58184b02e2925..00af88b177a3a4dc0c95973629c8dbeeb6f7ac9a 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -101,4 +101,4 @@ project_params=(
 docker exec -it \
   "${project_params[@]}" \
   l3drun \
-  /usr/local/bin/run $@
+  /usr/local/bin/run "$@"
diff --git a/start.sh b/start.sh
index 30b933218b9e7b17c136006c72c488683777f924..6653f74f6c774b626541b75b18cd678927377a14 100755
--- a/start.sh
+++ b/start.sh
@@ -241,18 +241,19 @@ if [[ -d /drupal/.idea ]]; then
 fi
 restoreEnvFile
 
-if [[ -x "${L3DSHELL}" ]]; then
-  ${L3DSHELL}
-else
-  /usr/bin/fish
-fi
-
+# Configure Git Hook
 if [[ ! -f .git/hooks/post-checkout ]]; then
   echo "#!/bin/sh" > .git/hooks/post-checkout
   chmod +x .git/hooks/post-checkout
 fi
 HOOK_DEFINED=$(grep /usr/local/bin/update-env .git/hooks/post-checkout)
 if [[ "$HOOK_DEFINED" = "" ]]; then
-  echo "/usr/local/bin/update-env" >> .git/hooks/post-checkout
+  echo "docker exec ${COMPOSE_PROJECT_NAME}_l3d /usr/local/bin/update-env" >> .git/hooks/post-checkout
 fi
 /usr/local/bin/update-env
+
+if [[ -x "${L3DSHELL}" ]]; then
+  ${L3DSHELL}
+else
+  /usr/bin/fish
+fi