diff --git a/docker-compose/apim-is-as-km-with-analytics/docker-compose.yml b/docker-compose/apim-is-as-km-with-analytics/docker-compose.yml
index 2eba2f0e..072a548a 100755
--- a/docker-compose/apim-is-as-km-with-analytics/docker-compose.yml
+++ b/docker-compose/apim-is-as-km-with-analytics/docker-compose.yml
@@ -29,7 +29,7 @@ services:
         hard: 40000
     command: [--ssl=0]
     healthcheck:
-      test: ["CMD", "sh", "-c", "mysqladmin ping -uroot -proot && [ -f /var/lib/mysql/initialization-complete.flag ]"]
+      test: ["CMD", "sh", "-c", "mysqladmin ping -uroot -proot && [ -f /var/lib/mysql/initialization-complete.flag ] && mysql -h localhost -uroot -proot -D WSO2AM_SHARED_DB -e 'SELECT 1 FROM UM_ORG LIMIT 1;'"]
       interval: 30s
       timeout: 60s
       retries: 5
diff --git a/docker-compose/apim-with-analytics/docker-compose.yml b/docker-compose/apim-with-analytics/docker-compose.yml
index e3c91675..063025af 100755
--- a/docker-compose/apim-with-analytics/docker-compose.yml
+++ b/docker-compose/apim-with-analytics/docker-compose.yml
@@ -29,7 +29,7 @@ services:
         hard: 40000
     command: [--ssl=0]
     healthcheck:
-      test: ["CMD", "sh", "-c", "mysqladmin ping -uroot -proot && [ -f /var/lib/mysql/initialization-complete.flag ]"]
+      test: ["CMD", "sh", "-c", "mysqladmin ping -uroot -proot && [ -f /var/lib/mysql/initialization-complete.flag ] && mysql -h localhost -uroot -proot -D WSO2AM_SHARED_DB -e 'SELECT 1 FROM UM_ORG LIMIT 1;'"]
       interval: 30s
       timeout: 60s
       retries: 5
diff --git a/docker-compose/apim-with-mi/docker-compose.yml b/docker-compose/apim-with-mi/docker-compose.yml
index 9610a5e5..daebc544 100644
--- a/docker-compose/apim-with-mi/docker-compose.yml
+++ b/docker-compose/apim-with-mi/docker-compose.yml
@@ -29,7 +29,7 @@ services:
         hard: 40000
     command: [--ssl=0]
     healthcheck:
-      test: ["CMD", "sh", "-c", "mysqladmin ping -uroot -proot && [ -f /var/lib/mysql/initialization-complete.flag ]"]
+      test: ["CMD", "sh", "-c", "mysqladmin ping -uroot -proot && [ -f /var/lib/mysql/initialization-complete.flag ] && mysql -h localhost -uroot -proot -D WSO2AM_SHARED_DB -e 'SELECT 1 FROM UM_ORG LIMIT 1;'"]
       interval: 30s
       timeout: 60s
       retries: 5