diff --git a/setup b/setup
index dda8fbb..dcc9fcd 100755
--- a/setup
+++ b/setup
@@ -6,18 +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%M%S')
+DATE=$(date +'%y%m%d%H%M%S')
 
 CONFIG_EXISTS="false"
-KEEP_CONFIG=""
+USE_EXISTING_CONFIG=""
+DELETE_CONFIG=""
 
-GITEA_CONTAINER_NAME="gitea_$DATE"
+GITEA_PROJECT_NAME="gitea_${DATE}"
+GITEA_PROJECT_NAME_SUFFIX=""
+GITEA_CONTAINER_NAME="${GITEA_PROJECT_NAME}_core"
 GITEA_VERSION=""
 GITEA_HOST_IP_ADDRESS=""
 GITEA_HOST_WEB_PORT=""
@@ -28,12 +31,24 @@ GITEA_DB_NAME=""
 GITEA_DB_USER=""
 GITEA_DB_PASSWORD=""
 
-if [ -f ".env" ]; then
+read -p "Enter gitea project name suffix (leave empty for none): " GITEA_PROJECT_NAME_SUFFIX
+
+if [ -n "$GITEA_PROJECT_NAME_SUFFIX" ]; then
+    GITEA_PROJECT_NAME="${GITEA_PROJECT_NAME}_${GITEA_PROJECT_NAME_SUFFIX}"
+    GITEA_CONTAINER_NAME="${GITEA_CONTAINER_NAME}_${GITEA_PROJECT_NAME_SUFFIX}"
+fi
+
+rm -f .env
+touch .env
+echo "COMPOSE_PROJECT_NAME="$GITEA_PROJECT_NAME >> .env
+echo "GITEA_CONTAINER_NAME="$GITEA_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 gitea version which should be used: " GITEA_VERSION
     read -p "Enter host (vm) ip address on which gitea should be accessible: " GITEA_HOST_IP_ADDRESS
     read -p "Enter host (vm) port on which gitea web-interface should be accessible: " GITEA_HOST_WEB_PORT
@@ -44,32 +59,44 @@ if [ $CONFIG_EXISTS == "false" ] || [ $KEEP_CONFIG == "n" ]; then
     read -p "Enter database user name for gitea: " GITEA_DB_USER
     read -p "Enter database user password for gitea: " GITEA_DB_PASSWORD
 
-    rm -f .env
-    touch .env
-    echo "GITEA_CONTAINER_NAME="$GITEA_CONTAINER_NAME >> .env
-    echo "GITEA_VERSION="$GITEA_VERSION >> .env
-    echo "GITEA_HOST_IP_ADDRESS="$GITEA_HOST_IP_ADDRESS >> .env
-    echo "GITEA_HOST_WEB_PORT="$GITEA_HOST_PORT >> .env
-    echo "GITEA_HOST_SSH_PORT="$GITEA_HOST_PORT >> .env
-    echo "GITEA_DB_HOST="$GITEA_DB_HOST >> .env
-    echo "GITEA_DB_PORT="$GITEA_DB_PORT >> .env
-    echo "GITEA_DB_NAME="$GITEA_DB_NAME >> .env
-    echo "GITEA_DB_USER="$GITEA_DB_USER >> .env
-    echo "GITEA_DB_PASSWORD="$GITEA_DB_PASSWORD >> .env
-
-    echo "Config file '.env' created!"
+    rm -f config
+    touch config
+    echo "GITEA_VERSION="$GITEA_VERSION >> config
+    echo "GITEA_HOST_IP_ADDRESS="$GITEA_HOST_IP_ADDRESS >> config
+    echo "GITEA_HOST_WEB_PORT="$GITEA_HOST_WEB_PORT >> config
+    echo "GITEA_HOST_SSH_PORT="$GITEA_HOST_SSH_PORT >> config
+    echo "GITEA_DB_HOST="$GITEA_DB_HOST >> config
+    echo "GITEA_DB_PORT="$GITEA_DB_PORT >> config
+    echo "GITEA_DB_NAME="$GITEA_DB_NAME >> config
+    echo "GITEA_DB_USER="$GITEA_DB_USER >> config
+    echo "GITEA_DB_PASSWORD="$GITEA_DB_PASSWORD >> config
+
+    echo "Config file 'config' created!"
 else
-    echo "Use existing config file '.env'!"
+    echo "Use existing config file 'config'!"
 fi
 
-read -p "Should the config file '.env' be deleted after creating the container? (y/n)" DELETE_CONFIG
+cat "config" >> ".env"
+
+read -p "Should the config file 'config' be deleted after creating the container? (y/n)" DELETE_CONFIG
 
 docker-compose up -d
 
+echo -n "Wait until gitea is ready ..."
+
+while ! curl -fILs $GITEA_HOST_IP_ADDRESS:$GITEA_HOST_WEB_PORT ; do
+    echo -n "."
+    sleep 1
+done
+
+echo -e "\nGitea is ready!"
+
 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!"