diff --git a/run/scripts/dir b/run/scripts/dir
index 801a8ff14f8543b03fb3c3c131e2992128bcb5e9..4860dc9d23514e347252110fc3169104805c91ef 100755
--- a/run/scripts/dir
+++ b/run/scripts/dir
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 if [[ -n $1 ]]; then
-  docker inspect ${1}_l3d | jq -r .[0].Config.Env | grep L3DHOSTDIR | cut -d'=' -f 2 | cut -d'"' -f 1
+  docker inspect ${1}_${USERNAME}_l3d | jq -r .[0].Config.Env | grep L3DHOSTDIR | cut -d'=' -f 2 | cut -d'"' -f 1
 fi
diff --git a/run/scripts/start b/run/scripts/start
index c3f546dc4ee8b10a9ee721bc6c6e2410c6978b0e..3f65ed3c8248ddab09e9b98f746f3f48c5f3eb19 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -51,9 +51,9 @@ function startContainer() {
     if [[ $COMPOSE_PROJECT_NAME == "." ]]; then
       mode=NONPRESISTENT
     else
-      ID=$(docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_l3d$)
+      ID=$(docker container ls --all -q -f name=^${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d$)
       if [[ -n ${ID} ]]; then
-        docker start ${COMPOSE_PROJECT_NAME}_l3d
+        docker start ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d
         mode=REGULAR
       fi
     fi
@@ -98,7 +98,7 @@ function startContainer() {
         start_params+=(
           --hostname ${COMPOSE_PROJECT_NAME}-l3d
         )
-        docker run --name ${COMPOSE_PROJECT_NAME}_l3d -dt \
+        docker run --name ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d -dt \
           "${start_params[@]}" \
           --restart unless-stopped \
           registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION}
@@ -137,7 +137,7 @@ function startContainer() {
     fi
     docker exec -it \
       "${start_params[@]}" \
-      ${COMPOSE_PROJECT_NAME}_l3d \
+      ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d \
       /usr/local/bin/.start
     exitContainer
   fi
@@ -147,7 +147,7 @@ if [[ -n $1 ]]; then
   if [[ "$1" == "." ]]; then
     COMPOSE_PROJECT_NAME=.
   else
-    ID=$(docker container ls --all -q -f name=^$1_l3d$)
+    ID=$(docker container ls --all -q -f name=^$1_${USERNAME}_l3d$)
     if [[ -n ${ID} ]]; then
       PHP_VERSION=unknown
       COMPOSE_PROJECT_NAME=$1
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 74c31a822a14090be6aaa7043f9d0566eefacccc..793f60a90c8ce41700ab00a2711c093865552028 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -81,7 +81,7 @@ fi
 
 # Chenge directory to the existing project root, if available.
 if [[ -n $1 ]]; then
-  ID=$(docker container ls --all -q -f name=^$1_l3d$)
+  ID=$(docker container ls --all -q -f name=^$1_${USERNAME}_l3d$)
   if [[ -n ${ID} ]]; then
     cd $(docker exec ${ID} php /usr/local/bin/volume.php --none)
   fi
diff --git a/start.sh b/start.sh
index 0d6cf30cd0149a4ca6213978fa12b0b4d65baa5f..1fa8357c37c7ec28de044c7541513d1930e5a41b 100755
--- a/start.sh
+++ b/start.sh
@@ -250,7 +250,7 @@ if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then
   if [[ "${COMPOSE_PROJECT_NAME}" != "." ]]; then
     echo -e "\\033[31m Killed the outdated container, please start again !!! \\033[0m"
     echo -e "\\033[31m ===================================================== \\033[0m"
-    docker rm -f ${COMPOSE_PROJECT_NAME}_l3d
+    docker rm -f ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d
   fi
 fi
 if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then
@@ -286,8 +286,8 @@ if [[ "${COMPOSE_PROJECT_NAME}" != "." ]]; 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'
+    OLDCOMMAND='docker exec '${COMPOSE_PROJECT_NAME}'_'${USERNAME}'_l3d /usr/local/bin/update-env'
+    NEWCOMMAND='RUNNING=$(docker container ls --all -q -f name='${COMPOSE_PROJECT_NAME}'_'${USERNAME}_'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