diff --git a/docker/tb-cassandra-schema/install-schema.sh b/docker/tb-cassandra-schema/install-schema.sh
index 279711933c..672a345869 100644
--- a/docker/tb-cassandra-schema/install-schema.sh
+++ b/docker/tb-cassandra-schema/install-schema.sh
@@ -18,7 +18,7 @@
 
 until nmap $CASSANDRA_URL -p 9042 | grep "9042/tcp open"
 do
-  echo "Wait for Cassandra..."
+  echo "Wait for $CASSANDRA_URL..."
   sleep 10
 done
 
diff --git a/docker/tb.env b/docker/tb.env
index 3850e3dee9..7947c23d43 100644
--- a/docker/tb.env
+++ b/docker/tb.env
@@ -1,5 +1,6 @@
 #Thingsboard server configuration
 
+TB_CASSANDRA_SCHEMA_URL=tb-cassandra-schema
 CASSANDRA_URL=cassandra:9042
 ZOOKEEPER_URL=zk:2181
 MQTT_BIND_ADDRESS=0.0.0.0
diff --git a/docker/tb/run-application.sh b/docker/tb/run-application.sh
index 461774cfa6..c5df758eda 100755
--- a/docker/tb/run-application.sh
+++ b/docker/tb/run-application.sh
@@ -21,12 +21,12 @@ dpkg -i /root/thingsboard.deb
 reachable=0
 while [ $reachable -eq 0 ];
 do
-  echo "tb-cassandra-schema container is still in progress. waiting until it completed..."
+  echo "$TB_CASSANDRA_SCHEMA_URL container is still in progress. waiting until it completed..."
   sleep 3
-  ping -q -c 1 tb-cassandra-schema > /dev/null 2>&1
+  ping -q -c 1 $TB_CASSANDRA_SCHEMA_URL > /dev/null 2>&1
   if [ "$?" -ne 0 ];
   then
-    echo "tb-cassandra-schema container completed!"
+    echo "$TB_CASSANDRA_SCHEMA_URL container completed!"
     reachable=1
   fi
 done