diff --git a/setup b/setup
index 0577a8b..f12cd56 100755
--- a/setup
+++ b/setup
@@ -69,7 +69,7 @@ docker-compose up -d
 
 echo -n "Wait until container is running ..."
 
-while [ "`docker inspect -f {{.State.Running}} $KIMAI_CONTAINER_NAME`" != "true" ]; do
+while [ "`docker inspect -f {{.State.Health.Status}} $KIMAI_CONTAINER_NAME`" != "healthy" ]; do
     echo -n "."
     sleep 1
 done
@@ -85,7 +85,7 @@ echo "    user:" >> tmp
 echo "        registration: false" >> tmp
 echo "        password_reset: false" >> tmp
 
-docker exec -i $KIMAI_CONTAINER_NAME dd of=/opt/kimai/config/packages/local.yaml < tmp
+docker exec -i $KIMAI_CONTAINER_NAME dd of=/opt/kimai/config/packages/local.yaml < tmp >> /dev/null
 
 rm -f tmp
 
@@ -93,7 +93,7 @@ docker restart -t 0 $KIMAI_CONTAINER_NAME >> /dev/null
 
 echo -n "Wait until container is running ..."
 
-while [ "`docker inspect -f {{.State.Running}} $KIMAI_CONTAINER_NAME`" != "true" ]; do
+while [ "`docker inspect -f {{.State.Health.Status}} $KIMAI_CONTAINER_NAME`" != "healthy" ]; do
     echo -n "."
     sleep 1
 done