diff --git a/setup b/setup
index 97408d0..37002e6 100755
--- a/setup
+++ b/setup
@@ -82,7 +82,21 @@ docker-compose up -d
 
 echo -n "Wait until postgres is ready ..."
 
-while ! docker exec $POSTGRES_CONTAINER_NAME pg_isready; do
+while ! docker exec $POSTGRES_CONTAINER_NAME pg_isready -q -U $POSTGRES_ADMIN_USER; do
+    echo -n "."
+    sleep 1
+done
+
+echo -n "."
+sleep 1
+echo -n "."
+sleep 1
+echo -n "."
+sleep 1
+echo -n "."
+sleep 1
+
+while ! docker exec $POSTGRES_CONTAINER_NAME pg_isready -q -U $POSTGRES_ADMIN_USER; do
     echo -n "."
     sleep 1
 done
@@ -90,6 +104,8 @@ done
 echo -e "\nPostgres is ready!"
 
 if [ $POSTGRES_SHARED_HOSTING == "y" ]; then
+    echo "Modify postgres rights for shared hosting..."
+
     rm -f tmp
     touch tmp
     echo "REVOKE ALL ON DATABASE template1 FROM public;" >> tmp
@@ -104,7 +120,7 @@ if [ $POSTGRES_SHARED_HOSTING == "y" ]; then
     echo "REVOKE ALL ON pg_tablespace FROM public;" >> tmp
     echo "REVOKE ALL ON pg_settings FROM public;" >> tmp
 
-    cat tmp | docker exec -i postgres psql -U $POSTGRES_ADMIN_USER -d template1
+    cat tmp | docker exec -i $POSTGRES_CONTAINER_NAME psql -U $POSTGRES_ADMIN_USER -d template1
 
     rm -f tmp
 fi