diff --git a/library/common/templates/lib/dependencies/_dbWait.tpl b/library/common/templates/lib/dependencies/_dbWait.tpl
index a2e0917b..aac6764b 100644
--- a/library/common/templates/lib/dependencies/_dbWait.tpl
+++ b/library/common/templates/lib/dependencies/_dbWait.tpl
@@ -366,13 +366,35 @@ command:
     echo "Executing DB waits..."
     {{ $cnpgName := include "tc.v1.common.lib.chart.names.fullname" $ }}
     {{ $cnpgName = printf "%v-cnpg-%v" $cnpgName $name }}
+    echo "Testing Database availability..."
+    until
+      echo "Testing database on url:  {{ $cnpgName }}-rw"
+      pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-rw
+      do sleep 5
+    done
+    {{ if and $cnpg.pooler $cnpg.pooler.enabled }}
     echo "Detected RW pooler, testing RW pooler availability..."
     until
       echo "Testing database on url:  {{ $cnpgName }}-pooler-rw"
       pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-pooler-rw
       do sleep 5
     done
-    {{ if and $cnpg.pooler $cnpg.pooler.createRO }}
+    {{ if  $cnpg.pooler.createRO }}
+    echo "Detected RO pooler, testing RO pooler availability..."
+    until
+      echo "Testing database on url:  {{ $cnpgName }}-pooler-ro"
+      pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-pooler-ro
+      do sleep 5
+    done
+    {{ end }}
+    {{ if and $cnpg.pooler $cnpg.pooler.enabled }}
+    echo "Detected RW pooler, testing RW pooler availability..."
+    until
+      echo "Testing database on url:  {{ $cnpgName }}-pooler-rw"
+      pg_isready -U {{ .user }} -d {{ .database }} -h {{ $cnpgName }}-pooler-rw
+      do sleep 5
+    done
+    {{ if  $cnpg.pooler.createRO }}
     echo "Detected RO pooler, testing RO pooler availability..."
     until
       echo "Testing database on url:  {{ $cnpgName }}-pooler-ro"
@@ -382,6 +404,7 @@ command:
     {{ end }}
     {{ end }}
     {{ end }}
+    {{ end }}
     sleep 5
     EOF
 {{- end -}}