diff --git a/docker/deploy_cassandra_zookeeper.sh b/docker/deploy_cassandra_zookeeper.sh
index 263ef4927c..d2fd9c8ed0 100755
--- a/docker/deploy_cassandra_zookeeper.sh
+++ b/docker/deploy_cassandra_zookeeper.sh
@@ -28,4 +28,4 @@ echo "building images.."
 $command build
 
 echo "starting cassandra, zookeeper, thingsboard-db-schema images..."
-$command up -d cassandra zookeeper thingsboard-db-schema
+$command up -d db zk thingsboard-db-schema
diff --git a/docker/docker-compose.random.yml b/docker/docker-compose.random.yml
index 9b5190142a..d70107a520 100644
--- a/docker/docker-compose.random.yml
+++ b/docker/docker-compose.random.yml
@@ -17,10 +17,10 @@
 version: '2'
 
 services:
-  cassandra:
+  db:
     ports:
       - "9042"
       - "9160"
-  zookeeper:
+  zk:
     ports:
       - "2181"
diff --git a/docker/docker-compose.static.yml b/docker/docker-compose.static.yml
index bdaf4eb99c..1661378b5f 100644
--- a/docker/docker-compose.static.yml
+++ b/docker/docker-compose.static.yml
@@ -17,10 +17,10 @@
 version: '2'
 
 services:
-  cassandra:
+  db:
     ports:
       - "9042:9042"
       - "9160:9160"
-  zookeeper:
+  zk:
     ports:
       - "2181:2181"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b15b7fa590..185d54fba5 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,24 +23,18 @@ services:
       - "8080:8080"
       - "1883:1883"
       - "5683:5683"
-    links:
-      - cassandra:db
-      - zookeeper:zk
-      - thingsboard-db-schema:thingsboard-db-schema
     env_file:
       - thingsboard.env
     entrypoint: ./run_thingsboard.sh
   thingsboard-db-schema:
     image: "thingsboard/thingsboard-db-schema:1.0"
-    links:
-      - cassandra:db
     env_file:
       - thingsboard-db-schema.env
     entrypoint: ./install_schema.sh
-  cassandra:
+  db:
     image: "cassandra:3.9"
     volumes:
       - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra"
-  zookeeper:
+  zk:
     image: "zookeeper:3.4.9"
     restart: always