diff --git a/docker/.env b/docker/.env
index f7cecd9ab6..c03637ecd5 100644
--- a/docker/.env
+++ b/docker/.env
@@ -3,4 +3,5 @@ CASSANDRA_DATA_DIR=/home/docker/cassandra_volume
 # cassandra schema container environment variables
 SKIP_SCHEMA_CREATION=false
 SKIP_SYSTEM_DATA=true
-SKIP_DEMO_DATA=true
\ No newline at end of file
+SKIP_DEMO_DATA=true
+CASSANDRA_URL=cassandra
\ No newline at end of file
diff --git a/docker/docker-compose.random.yml b/docker/docker-compose.random.yml
index 0e60e08da5..f066c5cad5 100644
--- a/docker/docker-compose.random.yml
+++ b/docker/docker-compose.random.yml
@@ -17,7 +17,7 @@
 version: '2'
 
 services:
-  db:
+  cassandra:
     ports:
       - "9042"
       - "9160"
diff --git a/docker/docker-compose.static.yml b/docker/docker-compose.static.yml
index 80cc6a946a..5471cb2339 100644
--- a/docker/docker-compose.static.yml
+++ b/docker/docker-compose.static.yml
@@ -17,7 +17,7 @@
 version: '2'
 
 services:
-  db:
+  cassandra:
     ports:
       - "9042:9042"
       - "9160:9160"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 893b02f5c1..498080447d 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -17,26 +17,27 @@
 version: '2'
 
 services:
-  thingsboard:
-    image: "thingsboard/application:1.2.3"
+  tb:
+    image: "thingsboard/application:k8stest"
     ports:
       - "8080:8080"
-      - "1883:1883"
+      - "1884:1883"
       - "5683:5683/udp"
     env_file:
-      - thingsboard.env
-    entrypoint: ./run_thingsboard.sh
-  thingsboard-db-schema:
-    image: "thingsboard/thingsboard-db-schema:1.2.3"
+      - tb.env
+    entrypoint: ./run-application.sh
+  tb-cassandra-schema:
+    image: "thingsboard/tb-cassandra-schema:k8stest"
     environment:
       - SKIP_SCHEMA_CREATION=${SKIP_SCHEMA_CREATION}
       - SKIP_SYSTEM_DATA=${SKIP_SYSTEM_DATA}
       - SKIP_DEMO_DATA=${SKIP_DEMO_DATA}
-    entrypoint: ./install_schema.sh
-  db:
-    image: "cassandra:3.9"
+      - CASSANDRA_URL=${CASSANDRA_URL}
+    entrypoint: ./install-schema.sh
+  cassandra:
+    image: "thingsboard/cassandra:k8stest"
     volumes:
       - "${CASSANDRA_DATA_DIR}:/var/lib/cassandra"
   zk:
-    image: "zookeeper:3.4.9"
+    image: "thingsboard/zk:k8stest"
     restart: always
diff --git a/docker/thingsboard-db-schema/Dockerfile b/docker/tb-cassandra-schema/Dockerfile
similarity index 90%
rename from docker/thingsboard-db-schema/Dockerfile
rename to docker/tb-cassandra-schema/Dockerfile
index a4b4c8778e..d8660d450a 100644
--- a/docker/thingsboard-db-schema/Dockerfile
+++ b/docker/tb-cassandra-schema/Dockerfile
@@ -16,12 +16,12 @@
 
 FROM cassandra:3.9
 
-ADD install_schema.sh /root/install_schema.sh
+ADD install-schema.sh /root/install-schema.sh
 
 RUN apt-get update \
         && apt-get install -y nmap
 
-RUN chmod +x /root/install_schema.sh
+RUN chmod +x /root/install-schema.sh
 
 ADD schema.cql /root/schema.cql
 ADD demo-data.cql /root/demo-data.cql
diff --git a/docker/thingsboard-db-schema/Makefile b/docker/tb-cassandra-schema/Makefile
similarity index 92%
rename from docker/thingsboard-db-schema/Makefile
rename to docker/tb-cassandra-schema/Makefile
index 604520e90d..aa18c4da2f 100644
--- a/docker/thingsboard-db-schema/Makefile
+++ b/docker/tb-cassandra-schema/Makefile
@@ -1,6 +1,6 @@
 VERSION=k8stest
 PROJECT=thingsboard
-APP=thingsboard-db-schema
+APP=tb-cassandra-schema
 
 build:
 	cp ../../dao/src/main/resources/schema.cql .
diff --git a/docker/thingsboard-db-schema/install_schema.sh b/docker/tb-cassandra-schema/install-schema.sh
similarity index 100%
rename from docker/thingsboard-db-schema/install_schema.sh
rename to docker/tb-cassandra-schema/install-schema.sh
diff --git a/docker/thingsboard-db-schema/thingsboard-db-schema.yaml b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
similarity index 87%
rename from docker/thingsboard-db-schema/thingsboard-db-schema.yaml
rename to docker/tb-cassandra-schema/tb-cassandra-schema.yaml
index 6d6040f2eb..9376d48a75 100644
--- a/docker/thingsboard-db-schema/thingsboard-db-schema.yaml
+++ b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
@@ -17,12 +17,12 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: tb-db-schema
+  name: tb-cassandra-schema
 spec:
   containers:
-  - name: tb-db-schema
+  - name: tb-cassandra-schema
     imagePullPolicy: Always
-    image: thingsboard/thingsboard-db-schema:k8stest
+    image: thingsboard/tb-cassandra-schema:k8stest
     env:
     - name: SKIP_SCHEMA_CREATION
       value: "false"
@@ -35,5 +35,5 @@ spec:
     command:
     - sh
     - -c
-    - ./install_schema.sh
+    - ./install-schema.sh
   restartPolicy: Never
\ No newline at end of file
diff --git a/docker/thingsboard.env b/docker/tb.env
similarity index 83%
rename from docker/thingsboard.env
rename to docker/tb.env
index 2325790cd6..3850e3dee9 100644
--- a/docker/thingsboard.env
+++ b/docker/tb.env
@@ -1,6 +1,6 @@
 #Thingsboard server configuration
 
-CASSANDRA_URL=db:9042
+CASSANDRA_URL=cassandra:9042
 ZOOKEEPER_URL=zk:2181
 MQTT_BIND_ADDRESS=0.0.0.0
 MQTT_BIND_PORT=1883
diff --git a/docker/thingsboard/Dockerfile b/docker/tb/Dockerfile
similarity index 88%
rename from docker/thingsboard/Dockerfile
rename to docker/tb/Dockerfile
index cbc1a3fcad..c2e2d7b631 100644
--- a/docker/thingsboard/Dockerfile
+++ b/docker/tb/Dockerfile
@@ -16,9 +16,9 @@
 
 FROM openjdk:8-jre
 
-ADD run_thingsboard.sh /root/run_thingsboard.sh
+ADD run-application.sh /root/run-application.sh
 ADD thingsboard.deb /root/thingsboard.deb
 
-RUN chmod +x /root/run_thingsboard.sh
+RUN chmod +x /root/run-application.sh
 
 WORKDIR /root
diff --git a/docker/thingsboard/Makefile b/docker/tb/Makefile
similarity index 100%
rename from docker/thingsboard/Makefile
rename to docker/tb/Makefile
diff --git a/docker/thingsboard/run_thingsboard.sh b/docker/tb/run-application.sh
similarity index 84%
rename from docker/thingsboard/run_thingsboard.sh
rename to docker/tb/run-application.sh
index 877fed7fec..461774cfa6 100755
--- a/docker/thingsboard/run_thingsboard.sh
+++ b/docker/tb/run-application.sh
@@ -21,12 +21,12 @@ dpkg -i /root/thingsboard.deb
 reachable=0
 while [ $reachable -eq 0 ];
 do
-  echo "thingsboard-db-schema container is still in progress. waiting until it completed..."
+  echo "tb-cassandra-schema container is still in progress. waiting until it completed..."
   sleep 3
-  ping -q -c 1 thingsboard-db-schema > /dev/null 2>&1
+  ping -q -c 1 tb-cassandra-schema > /dev/null 2>&1
   if [ "$?" -ne 0 ];
   then
-    echo "thingsboard-db-schema container completed!"
+    echo "tb-cassandra-schema container completed!"
     reachable=1
   fi
 done
diff --git a/docker/thingsboard/thingsboard.yaml b/docker/tb/tb.yaml
similarity index 98%
rename from docker/thingsboard/thingsboard.yaml
rename to docker/tb/tb.yaml
index f03f49bcf1..b65a2e90c5 100644
--- a/docker/thingsboard/thingsboard.yaml
+++ b/docker/tb/tb.yaml
@@ -112,7 +112,7 @@ spec:
         command:
         - sh
         - -c
-        - ./run_thingsboard.sh
+        - ./run-application.sh
         livenessProbe:
           httpGet:
             path: /login
diff --git a/docker/zookeeper/Dockerfile b/docker/zookeeper/Dockerfile
index 7d3480e825..5ec1ac9be1 100644
--- a/docker/zookeeper/Dockerfile
+++ b/docker/zookeeper/Dockerfile
@@ -55,7 +55,7 @@ RUN set -x \
 	&& rm -rf /var/lib/apt/lists/*
 
 #Copy configuration generator script to bin
-COPY zkGenConfig.sh zkOk.sh /opt/zookeeper/bin/
+COPY zk-gen-config.sh zk-ok.sh /opt/zookeeper/bin/
 
 # Create a user for the zookeeper process and configure file system ownership 
 # for nessecary directories and symlink the distribution as a user executable
diff --git a/docker/zookeeper/zkGenConfig.sh b/docker/zookeeper/zk-gen-config.sh
similarity index 100%
rename from docker/zookeeper/zkGenConfig.sh
rename to docker/zookeeper/zk-gen-config.sh
diff --git a/docker/zookeeper/zkOk.sh b/docker/zookeeper/zk-ok.sh
similarity index 91%
rename from docker/zookeeper/zkOk.sh
rename to docker/zookeeper/zk-ok.sh
index 449a0fdfa0..f2a2d32ae3 100755
--- a/docker/zookeeper/zkOk.sh
+++ b/docker/zookeeper/zk-ok.sh
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-# zkOk.sh uses the ruok ZooKeeper four letter work to determine if the instance
+# zk-ok.sh uses the ruok ZooKeeper four letter work to determine if the instance
 # is health. The $? variable will be set to 0 if server responds that it is 
 # healthy, or 1 if the server fails to respond.
 
diff --git a/docker/zookeeper/zookeeper.yaml b/docker/zookeeper/zookeeper.yaml
index 062d8cc4ee..4b8501d524 100644
--- a/docker/zookeeper/zookeeper.yaml
+++ b/docker/zookeeper/zookeeper.yaml
@@ -159,17 +159,17 @@ spec:
         command:
         - sh
         - -c
-        - zkGenConfig.sh && zkServer.sh start-foreground
+        - zk-gen-config.sh && zkServer.sh start-foreground
         readinessProbe:
           exec:
             command:
-            - "zkOk.sh"
+            - "zk-ok.sh"
           initialDelaySeconds: 15
           timeoutSeconds: 5
         livenessProbe:
           exec:
             command:
-            - "zkOk.sh"
+            - "zk-ok.sh"
           initialDelaySeconds: 15
           timeoutSeconds: 5
         volumeMounts: