diff --git a/setup b/setup
index b04b870..f16be5d 100755
--- a/setup
+++ b/setup
@@ -6,16 +6,21 @@ echo "# Dennis Buchhorn - bucde@b-eit.de                                 #"
 echo "####################################################################"
 echo "# WARNING: password is plain text input!                           #"
 echo "#                                                                  #"
-echo "# Config will be saved in '.env' file.                             #"
+echo "# Config will be saved in 'config' file.                           #"
 echo "# (everything in plain text, even the password)                    #"
 #echo "#  #"
 echo "####################################################################"
 echo ""
 
+DATE=$(date +'%y%m%d%H%M%S')
+
 CONFIG_EXISTS="false"
-KEEP_CONFIG=""
+USE_EXISTING_CONFIG=""
+DELETE_CONFIG=""
 
-KIMAI_CONTAINER_NAME="kimai_$(date +'%y%m%d')"
+KIMAI_PROJECT_NAME="kimai_${DATE}"
+KIMAI_PROJECT_NAME_SUFFIX=""
+KIMAI_CONTAINER_NAME="${KIMAI_PROJECT_NAME}_core"
 KIMAI_VERSION=""
 KIMAI_HOST_IP_ADDRESS=""
 KIMAI_HOST_PORT=""
@@ -29,12 +34,25 @@ KIMAI_DB_PASSWORD=""
 
 DISABLE_REGISTRATION=""
 
-if [ -f ".env" ]; then
+
+read -p "Enter kimai project name suffix (leave empty for none): " KIMAI_PROJECT_NAME_SUFFIX
+
+if [ -n "$KIMAI_PROJECT_NAME_SUFFIX" ]; then
+    KIMAI_PROJECT_NAME="${KIMAI_PROJECT_NAME}_${KIMAI_PROJECT_NAME_SUFFIX}"
+    KIMAI_CONTAINER_NAME="${KIMAI_CONTAINER_NAME}_${KIMAI_PROJECT_NAME_SUFFIX}"
+fi
+
+rm -f .env
+touch .env
+echo "COMPOSE_PROJECT_NAME="$KIMAI_PROJECT_NAME >> .env
+echo "KIMAI_CONTAINER_NAME="$KIMAI_CONTAINER_NAME >> .env
+
+if [ -f "config" ]; then
     CONFIG_EXISTS="true"
-    read -p "Config file '.env' already exists! Would you like to use this? (y/n)" KEEP_CONFIG
+    read -p "Config file 'config' already exists! Would you like to use this? (y/n)" USE_EXISTING_CONFIG
 fi
 
-if [ $CONFIG_EXISTS == "false" ] || [ $KEEP_CONFIG == "n" ]; then
+if [ $CONFIG_EXISTS == "false" ] || [ $USE_EXISTING_CONFIG == "n" ]; then
     read -p "Enter kimai version which should be used: " KIMAI_VERSION
     read -p "Enter host (vm) ip address on which kimai should be accessible: " KIMAI_HOST_IP_ADDRESS
     read -p "Enter host (vm) port on which kimai should be accessible: " KIMAI_HOST_PORT
@@ -46,39 +64,40 @@ if [ $CONFIG_EXISTS == "false" ] || [ $KEEP_CONFIG == "n" ]; then
     read -p "Enter database user name for kimai: " KIMAI_DB_USER
     read -p "Enter database user password for kimai: " KIMAI_DB_PASSWORD
 
-    rm -f .env
-    touch .env
-    echo "KIMAI_CONTAINER_NAME="$KIMAI_CONTAINER_NAME >> .env
-    echo "KIMAI_VERSION="$KIMAI_VERSION >> .env
-    echo "KIMAI_HOST_IP_ADDRESS="$KIMAI_HOST_IP_ADDRESS >> .env
-    echo "KIMAI_HOST_PORT="$KIMAI_HOST_PORT >> .env
-    echo "KIMAI_SUPERADMIN_MAIL="$KIMAI_SUPERADMIN_MAIL >> .env
-    echo "KIMAI_SUPERADMIN_PASSWORD="$KIMAI_SUPERADMIN_PASSWORD >> .env
-    echo "KIMAI_DB_HOST="$KIMAI_DB_HOST >> .env
-    echo "KIMAI_DB_PORT="$KIMAI_DB_PORT >> .env
-    echo "KIMAI_DB_NAME="$KIMAI_DB_NAME >> .env
-    echo "KIMAI_DB_USER="$KIMAI_DB_USER >> .env
-    echo "KIMAI_DB_PASSWORD="$KIMAI_DB_PASSWORD >> .env
-
-    echo "Config file '.env' created!"
+    rm -f config
+    touch config
+    echo "KIMAI_VERSION="$KIMAI_VERSION >> config
+    echo "KIMAI_HOST_IP_ADDRESS="$KIMAI_HOST_IP_ADDRESS >> config
+    echo "KIMAI_HOST_PORT="$KIMAI_HOST_PORT >> config
+    echo "KIMAI_SUPERADMIN_MAIL="$KIMAI_SUPERADMIN_MAIL >> config
+    echo "KIMAI_SUPERADMIN_PASSWORD="$KIMAI_SUPERADMIN_PASSWORD >> config
+    echo "KIMAI_DB_HOST="$KIMAI_DB_HOST >> config
+    echo "KIMAI_DB_PORT="$KIMAI_DB_PORT >> config
+    echo "KIMAI_DB_NAME="$KIMAI_DB_NAME >> config
+    echo "KIMAI_DB_USER="$KIMAI_DB_USER >> config
+    echo "KIMAI_DB_PASSWORD="$KIMAI_DB_PASSWORD >> config
+
+    echo "Config file 'config' created!"
 else
-    echo "Use existing config file '.env'!"
+    echo "Use existing config file 'config'!"
 fi
 
-read -p "Would you like to disable user registration and password reset via mail? (y/n)" DISABLE_REGISTRATION
+cat "config" >> ".env"
 
-read -p "Should the config file '.env' be deleted after creating the container? (y/n)" DELETE_CONFIG
+read -p "Should the config file 'config' be deleted after creating the container? (y/n)" DELETE_CONFIG
+
+read -p "Would you like to disable user registration and password reset via mail? (y/n)" DISABLE_REGISTRATION
 
 docker-compose up -d
 
-echo -n "Wait until container is running ..."
+echo -n "Wait until kimai is ready ..."
 
 while [ "`docker inspect -f {{.State.Health.Status}} $KIMAI_CONTAINER_NAME`" != "healthy" ]; do
     echo -n "."
     sleep 1
 done
 
-echo -e "\nContainer is running!"
+echo -e "\nKimai is ready!"
 
 if [ $DISABLE_REGISTRATION == "y" ]; then
     echo "Create 'local.yaml' file and restart container."
@@ -96,20 +115,22 @@ if [ $DISABLE_REGISTRATION == "y" ]; then
 
     docker restart -t 0 $KIMAI_CONTAINER_NAME >> /dev/null
 
-    echo -n "Wait until container is running ..."
+    echo -n "Wait until kimai is ready ..."
 
     while [ "`docker inspect -f {{.State.Health.Status}} $KIMAI_CONTAINER_NAME`" != "healthy" ]; do
         echo -n "."
         sleep 1
     done
 
-    echo -e "\nContainer is running!"
+    echo -e "\nKimai is ready!"
 fi
 
 if [ $DELETE_CONFIG == "y" ]; then
-    rm -f .env
+    rm -f config
 
-    echo "Config file '.env' deleted!"
+    echo "Config file 'config' deleted!"
 fi
 
+rm -f .env
+
 echo "Done!"