diff --git a/docker/k8s/cassandra-setup.yaml b/docker/k8s/cassandra-setup.yaml
index 996ab1230e..b740baae39 100644
--- a/docker/k8s/cassandra-setup.yaml
+++ b/docker/k8s/cassandra-setup.yaml
@@ -32,6 +32,8 @@ spec:
       value: "9042"
     - name : DATABASE_TYPE
       value: "cassandra"
+    - name : CASSANDRA_URL
+      value: "cassandra-headless:9042"
     command:
     - sh
     - -c
diff --git a/docker/tb.env b/docker/tb.env
index c99e623b8a..1a512fd8e6 100644
--- a/docker/tb.env
+++ b/docker/tb.env
@@ -16,6 +16,8 @@ CASSANDRA_HOST=cassandra
 CASSANDRA_PORT=9042
 
 # postgres db config
+POSTGRES_HOST=cassandra
+POSTGRES_PORT=9042
 # SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQLDialect
 # SPRING_DRIVER_CLASS_NAME=org.postgresql.Driver
 # SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/thingsboard
diff --git a/docker/tb/run-application.sh b/docker/tb/run-application.sh
index 783b35b0c3..55a2988b8c 100755
--- a/docker/tb/run-application.sh
+++ b/docker/tb/run-application.sh
@@ -28,7 +28,7 @@ fi
 
 if [ "$DATABASE_TYPE" == "sql" ]; then
     if [ "$SPRING_DRIVER_CLASS_NAME" == "org.postgresql.Driver" ]; then
-        until nmap postgres -p 5432 | grep "5432/tcp open"
+        until nmap $POSTGRES_HOST -p $POSTGRES_PORT | grep "$POSTGRES_PORT/tcp open"
         do
           echo "Waiting for postgres db to start..."
           sleep 10