diff --git a/Dockerfile b/Dockerfile
index 88b2f428799420309bbb4e2a6dd8b7b0490e2a2c..9d92f64cd07941d947529bf2cbacf30655c658bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -122,6 +122,8 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     \
     composer selfupdate && \
     \
+    git config --global --add safe.directory * && \
+    \
     ln -sf /usr/local/bin/ahoy /usr/local/bin/a && \
     ln -sf /usr/local/bin/composer /usr/local/bin/c && \
     ln -sf /usr/local/bin/docker-compose /usr/local/bin/d-c && \
diff --git a/bin/update-env b/bin/update-env
index 6c4aaf764a014d98bce97b8513a1a002071cf4bf..fd01e7ef0e4fd247671f42b2dc8ab6519113c208 100755
--- a/bin/update-env
+++ b/bin/update-env
@@ -18,7 +18,7 @@ if [[ "$CI_COMMIT_REF_NAME" = "" ]]; then
 else
   PROJECT_BRANCH=$CI_COMMIT_REF_NAME
 fi
-PROJECT_BRANCH_SANITIZED=$(echo "$PROJECT_BRANCH" | sed -r 's/[\/_]+/-/g')
+PROJECT_BRANCH_SANITIZED=$(echo "$PROJECT_BRANCH" | tr [:upper:] [:lower:] | sed -r 's/[\/_]+/-/g')
 
 echo "PROJECT_NAME=${PROJECT_NAME}" >>.env
 echo "PROJECT_BRANCH=${PROJECT_BRANCH}" >>.env