diff --git a/setup b/setup
index ef6dc47..24c8220 100755
--- a/setup
+++ b/setup
@@ -18,7 +18,8 @@ CONFIG_EXISTS="false"
 USE_EXISTING_CONFIG=""
 DELETE_CONFIG=""
 
-MARIADB_CONTAINER_NAME="mariadb_$DATE"
+MARIADB_PROJECT_NAME="mariadb_${DATE}"
+MARIADB_CONTAINER_NAME="${MARIADB_PROJECT_NAME}"
 MARIADB_VERSION=""
 MARIADB_HOST_IP_ADDRESS=""
 MARIADB_HOST_PORT=""
@@ -42,6 +43,7 @@ if [ $CONFIG_EXISTS == "false" ] || [ $USE_EXISTING_CONFIG == "n" ]; then
 
     rm -f .env
     touch .env
+    echo "COMPOSE_PROJECT_NAME="$MARIADB_PROJECT_NAME >> .env
     echo "MARIADB_CONTAINER_NAME="$MARIADB_CONTAINER_NAME >> .env
     echo "MARIADB_CONTAINER_NAME_SUFFIX="$MARIADB_CONTAINER_NAME_SUFFIX >> .env
     echo "MARIADB_VERSION="$MARIADB_VERSION >> .env
@@ -57,7 +59,6 @@ docker-compose up -d
 echo -n "Wait until mariadb is ready ..."
 
 while ! docker exec $MARIADB_CONTAINER_NAME mysql --password=$MARIADB_ROOT_PASSWORD -e "SELECT 1" > /dev/null 2>&1; do
-#while [ "`docker inspect -f {{.State.Health.Status}} $KIMAI_CONTAINER_NAME`" != "healthy" ]; do
     echo -n "."
     sleep 1
 done