diff --git a/setup b/setup
index be231d8..a0ba910 100755
--- a/setup
+++ b/setup
@@ -19,17 +19,18 @@ USE_EXISTING_CONFIG=""
 DELETE_CONFIG=""
 
 MARIADB_PROJECT_NAME="mariadb_${DATE}"
-MARIADB_CONTAINER_NAME="${MARIADB_PROJECT_NAME}"
-MARIADB_CONTAINER_NAME_SUFFIX=""
+MARIADB_PROJECT_NAME_SUFFIX=""
+MARIADB_CONTAINER_NAME="${MARIADB_PROJECT_NAME}_db"
 MARIADB_VERSION=""
 MARIADB_HOST_IP_ADDRESS=""
 MARIADB_HOST_PORT=""
 MARIADB_ROOT_PASSWORD=""
 
-read -p "Enter mariadb container name suffix (leave empty for none): " MARIADB_CONTAINER_NAME_SUFFIX
+read -p "Enter mariadb project name suffix (leave empty for none): " MARIADB_PROJECT_NAME_SUFFIX
 
-if [ -n "$MARIADB_CONTAINER_NAME_SUFFIX" ]; then
-    MARIADB_CONTAINER_NAME="${MARIADB_CONTAINER_NAME}_${MARIADB_CONTAINER_NAME_SUFFIX}"
+if [ -n "$MARIADB_PROJECT_NAME_SUFFIX" ]; then
+    MARIADB_PROJECT_NAME="${MARIADB_PROJECT_NAME}_${MARIADB_PROJECT_NAME_SUFFIX}"
+    MARIADB_CONTAINER_NAME="${MARIADB_CONTAINER_NAME}_${MARIADB_PROJECT_NAME_SUFFIX}"
 fi
 
 rm -f .env
@@ -64,6 +65,17 @@ docker-compose up -d
 
 echo -n "Wait until mariadb is ready ..."
 
+# wait two times, because mariadb restarts once after configuration
+while ! docker exec $MARIADB_CONTAINER_NAME mysql --password=$MARIADB_ROOT_PASSWORD -e "SELECT 1" > /dev/null 2>&1; do
+    echo -n "."
+    sleep 1
+done
+
+echo -n "."
+sleep 1
+echo -n "."
+sleep 1
+
 while ! docker exec $MARIADB_CONTAINER_NAME mysql --password=$MARIADB_ROOT_PASSWORD -e "SELECT 1" > /dev/null 2>&1; do
     echo -n "."
     sleep 1