diff --git a/docker/deploy_cassandra_zookeeper.sh b/docker/deploy_cassandra_zookeeper.sh
index 6c4cc50592..263ef4927c 100755
--- a/docker/deploy_cassandra_zookeeper.sh
+++ b/docker/deploy_cassandra_zookeeper.sh
@@ -27,5 +27,5 @@ $command rm -f
 echo "building images.."
 $command build
 
-echo "starting cassandra, zookeeper, db-schema images..."
-$command up -d cassandra zookeeper db-schema
+echo "starting cassandra, zookeeper, thingsboard-db-schema images..."
+$command up -d cassandra zookeeper thingsboard-db-schema
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 65b0aa7087..fd1c0a1991 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,7 +18,7 @@ version: '2'
 
 services:
   thingsboard:
-    build: thingsboard
+    image: "thingsboard/application:0.1"
     ports:
       - "8080:8080"
       - "1883:1883"
@@ -27,8 +27,6 @@ services:
       - cassandra:db
       - zookeeper:zk
       - thingsboard-db-schema:thingsboard-db-schema
-    volumes:
-      - "../application/target/thingsboard.deb:/root/thingsboard.deb"
     env_file:
       - thingsboard.env
     entrypoint: ./run_thingsboard.sh
diff --git a/docker/thingsboard/Dockerfile b/docker/thingsboard/Dockerfile
index c145939ee4..1587d79203 100644
--- a/docker/thingsboard/Dockerfile
+++ b/docker/thingsboard/Dockerfile
@@ -17,6 +17,7 @@
 FROM openjdk:8-jre
 
 ADD run_thingsboard.sh /root/run_thingsboard.sh
+ADD thingsboard.deb /root/thingsboard.deb
 
 RUN chmod +x /root/run_thingsboard.sh
 
diff --git a/docker/thingsboard/build_and_deploy.sh b/docker/thingsboard/build_and_deploy.sh
new file mode 100755
index 0000000000..20f2903377
--- /dev/null
+++ b/docker/thingsboard/build_and_deploy.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cp ../../application/target/thingsboard.deb thingsboard.deb
+
+docker build -t thingsboard/application:0.1 .
+
+docker login
+
+docker push thingsboard/application:0.1
\ No newline at end of file