diff --git a/.ci/setup_kong.sh b/.ci/setup_kong.sh
index 023710f..1272a15 100755
--- a/.ci/setup_kong.sh
+++ b/.ci/setup_kong.sh
@@ -15,9 +15,9 @@ GATEWAY_CONTAINER_NAME=kong
 
 waitContainer() {
   for try in {1..100}; do
-    echo "waiting for $1.."
-    nc localhost $2 && break;
-    sleep $3
+    echo "waiting for $1"
+    docker exec --user root $2 $3 && break;
+    sleep 0.2
   done
 }
 
@@ -33,7 +33,7 @@ docker run --rm -d --name $PG_CONTAINER_NAME \
   -e "POSTGRES_PASSWORD=$KONG_DB_PASSWORD" \
   postgres:9.6
 
-waitContainer "PostgreSQL" 8001 0.2
+waitContainer "PostGres" $PG_CONTAINER_NAME pg_isready
 
 # Prepare the Kong database
 docker run --rm --network=$NETWORK_NAME \
@@ -62,4 +62,4 @@ docker run -d --name $GATEWAY_CONTAINER_NAME \
   -p 127.0.0.1:8444:8444 \
   $KONG_IMAGE
 
-waitContainer "Kong" 8001 0.2
+waitContainer "Kong" $GATEWAY_CONTAINER_NAME "kong health"
diff --git a/.ci/setup_kong_ee.sh b/.ci/setup_kong_ee.sh
index 245bf71..1ef4585 100755
--- a/.ci/setup_kong_ee.sh
+++ b/.ci/setup_kong_ee.sh
@@ -71,18 +71,10 @@ GATEWAY_CONTAINER_NAME=kong
 # create docker network
 docker network create $NETWORK_NAME
 
-waitPostGres() {
+waitContainer() {
   for try in {1..100}; do
-    echo "waiting for PostgreSQL"
-    nc localhost 5432 && break;
-    sleep 0.2
-  done
-}
-
-waitKong() {
-  for try in {1..100}; do
-    echo "waiting for Kong"
-    docker exec --user root kong kong health && break;
+    echo "waiting for $1"
+    docker exec --user root $2 $3 && break;
     sleep 0.2
   done
 }
@@ -96,7 +88,7 @@ docker run --rm -d --name $PG_CONTAINER_NAME \
   -e "POSTGRES_PASSWORD=$KONG_DB_PASSWORD" \
   postgres:9.6
 
-waitPostGres
+waitContainer "PostGres" $PG_CONTAINER_NAME pg_isready
 
 # Prepare the Kong database
 docker run --rm --network=$NETWORK_NAME \
@@ -134,4 +126,4 @@ docker run -d --name $GATEWAY_CONTAINER_NAME \
   -p 8004:8004 \
   $KONG_IMAGE
 
-waitKong
+waitContainer "Kong" $GATEWAY_CONTAINER_NAME "kong health"