diff --git a/start.sh b/start.sh
index 9e9c13636124b17026fb34abfbc19c183902d448..dcb6b327f86ecf13f37f457b1e4331e29a8f93f1 100755
--- a/start.sh
+++ b/start.sh
@@ -27,6 +27,9 @@ function truncateCurrentDirectory {
 }
 
 function restoreEnvFile {
+  if [[ "${COMPOSE_PROJECT_NAME}" == "." ]]; then
+    return
+  fi
   if [[ -n ${PHP_VERSION} ]]; then
     echo "PHP_VERSION=${PHP_VERSION}" >>.env
   fi
@@ -235,31 +238,34 @@ else
   l3dComposer
 fi
 
-setupAhoy
 if [[ -d /drupal/.idea ]]; then
   /usr/local/bin/.configIdea
 fi
 restoreEnvFile
 
-# Configure Git Hook
-if [[ -d .git ]]; then
-  if [[ ! -d .git/hooks ]]; then
-    mkdir -p .git/hooks
-  fi
-  if [[ ! -f .git/hooks/post-checkout ]]; then
-    echo "#!/bin/sh" > .git/hooks/post-checkout
-    chmod +x .git/hooks/post-checkout
-  fi
-  OLDCOMMAND='docker exec '${COMPOSE_PROJECT_NAME}'_l3d /usr/local/bin/update-env'
-  NEWCOMMAND='RUNNING=$(docker container ls --all -q -f name='${COMPOSE_PROJECT_NAME}'_l3d);if [ "x$RUNNING" != "x" ];then docker exec '${COMPOSE_PROJECT_NAME}'_l3d /usr/local/bin/update-env;fi'
-  OLD_HOOK_DEFINED=$(grep "$OLDCOMMAND" .git/hooks/post-checkout)
-  NEW_HOOK_DEFINED=$(grep "$NEWCOMMAND" .git/hooks/post-checkout)
-  if [[ "x$OLD_HOOK_DEFINED" = "x" ]]; then
-    echo "$NEWCOMMAND" >> .git/hooks/post-checkout
-  elif [[ "x$NEW_HOOK_DEFINED" = "x" ]]; then
-    OLDCOMMAND="${OLDCOMMAND//\//\\/}"
-    sed -i -e "/${OLDCOMMAND}/d" .git/hooks/post-checkout
-    echo "$NEWCOMMAND" >> .git/hooks/post-checkout
+if [[ "${COMPOSE_PROJECT_NAME}" != "." ]]; then
+  # Setup Ahoy
+  setupAhoy
+  # Configure Git Hook
+  if [[ -d .git ]]; then
+    if [[ ! -d .git/hooks ]]; then
+      mkdir -p .git/hooks
+    fi
+    if [[ ! -f .git/hooks/post-checkout ]]; then
+      echo "#!/bin/sh" > .git/hooks/post-checkout
+      chmod +x .git/hooks/post-checkout
+    fi
+    OLDCOMMAND='docker exec '${COMPOSE_PROJECT_NAME}'_l3d /usr/local/bin/update-env'
+    NEWCOMMAND='RUNNING=$(docker container ls --all -q -f name='${COMPOSE_PROJECT_NAME}'_l3d);if [ "x$RUNNING" != "x" ];then docker exec '${COMPOSE_PROJECT_NAME}'_l3d /usr/local/bin/update-env;fi'
+    OLD_HOOK_DEFINED=$(grep "$OLDCOMMAND" .git/hooks/post-checkout)
+    NEW_HOOK_DEFINED=$(grep "$NEWCOMMAND" .git/hooks/post-checkout)
+    if [[ "x$OLD_HOOK_DEFINED" = "x" ]]; then
+      echo "$NEWCOMMAND" >> .git/hooks/post-checkout
+    elif [[ "x$NEW_HOOK_DEFINED" = "x" ]]; then
+      OLDCOMMAND="${OLDCOMMAND//\//\\/}"
+      sed -i -e "/${OLDCOMMAND}/d" .git/hooks/post-checkout
+      echo "$NEWCOMMAND" >> .git/hooks/post-checkout
+    fi
   fi
 fi
 /usr/local/bin/update-env