diff --git a/scripts/wait_for_postgres.bash b/scripts/wait_for_postgres.bash
index cb48c3b2..58dcf0df 100755
--- a/scripts/wait_for_postgres.bash
+++ b/scripts/wait_for_postgres.bash
@@ -16,13 +16,18 @@ done
 
 source /etc/profile
 
-echo "Postgres service running; ensuring ${POSTGRES_DB} database exists and has PostGIS extensions..."
-psql -d postgres -h "${POSTGRES_HOST}" -p "${POSTGRES_PORT}" -U "${POSTGRES_USER}" <<EOF
-CREATE DATABASE "$POSTGRES_DB" OWNER "$POSTGRES_USER";
-\c "$POSTGRES_DB"
-CREATE EXTENSION IF NOT EXISTS postgis;
-CREATE EXTENSION IF NOT EXISTS postgis_topology;
-CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
-CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
-EOF
-echo "Postgres database ${POSTGRES_DB} ready for use!"
+
+DATABASES_LIST="${KPI_POSTGRES_DB} ${KC_POSTGRES_DB}"
+
+for POSTGRES_DB in "${DATABASES_LIST}"; do
+    echo "Postgres service running; ensuring ${POSTGRES_DB} database exists and has PostGIS extensions..."
+    psql -d postgres -h "${POSTGRES_HOST}" -p "${POSTGRES_PORT}" -U "${POSTGRES_USER}" <<EOF
+    CREATE DATABASE "$POSTGRES_DB" OWNER "$POSTGRES_USER";
+    \c "$POSTGRES_DB"
+    CREATE EXTENSION IF NOT EXISTS postgis;
+    CREATE EXTENSION IF NOT EXISTS postgis_topology;
+    CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
+    CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+    EOF
+    echo "Postgres database ${POSTGRES_DB} ready for use!"
+done