diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index c86f20d98c..ebf1202061 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,16 +18,16 @@ version: '2'
 
 services:
   tb:
-    image: "thingsboard/application:k8stest"
+    image: "thingsboard/application:1.2.4"
     ports:
       - "8080:8080"
-      - "1884:1883"
+      - "1883:1883"
       - "5683:5683/udp"
     env_file:
       - tb.env
     entrypoint: ./run-application.sh
   tb-cassandra-schema:
-    image: "thingsboard/tb-cassandra-schema:k8stest"
+    image: "thingsboard/tb-cassandra-schema:1.2.4"
     environment:
       - SKIP_SCHEMA_CREATION=${SKIP_SCHEMA_CREATION}
       - SKIP_SYSTEM_DATA=${SKIP_SYSTEM_DATA}
diff --git a/docker/tb-cassandra-schema/Makefile b/docker/tb-cassandra-schema/Makefile
index aa18c4da2f..c3f2820d07 100644
--- a/docker/tb-cassandra-schema/Makefile
+++ b/docker/tb-cassandra-schema/Makefile
@@ -1,4 +1,4 @@
-VERSION=k8stest
+VERSION=1.2.4
 PROJECT=thingsboard
 APP=tb-cassandra-schema
 
diff --git a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
index 9376d48a75..e3340a438a 100644
--- a/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
+++ b/docker/tb-cassandra-schema/tb-cassandra-schema.yaml
@@ -22,7 +22,7 @@ spec:
   containers:
   - name: tb-cassandra-schema
     imagePullPolicy: Always
-    image: thingsboard/tb-cassandra-schema:k8stest
+    image: thingsboard/tb-cassandra-schema:1.2.4
     env:
     - name: SKIP_SCHEMA_CREATION
       value: "false"
diff --git a/docker/tb/Makefile b/docker/tb/Makefile
index 000968e447..afd1f807da 100644
--- a/docker/tb/Makefile
+++ b/docker/tb/Makefile
@@ -1,4 +1,4 @@
-VERSION=k8stest
+VERSION=1.2.4
 PROJECT=thingsboard
 APP=application
 
diff --git a/docker/tb/tb.yaml b/docker/tb/tb.yaml
index b65a2e90c5..15ed1939d5 100644
--- a/docker/tb/tb.yaml
+++ b/docker/tb/tb.yaml
@@ -79,7 +79,7 @@ spec:
       containers:
       - name: tb
         imagePullPolicy: Always
-        image: thingsboard/application:k8stest
+        image: thingsboard/application:1.2.4
         ports:
         - containerPort: 8080
           name: ui
diff --git a/docker/zookeeper/Makefile b/docker/zookeeper/Makefile
index b179f07291..6e4ef125ff 100644
--- a/docker/zookeeper/Makefile
+++ b/docker/zookeeper/Makefile
@@ -1,4 +1,4 @@
-VERSION=k8stest
+VERSION=1.2.4
 PROJECT=thingsboard
 APP=zk
 
diff --git a/docker/zookeeper/zookeeper.yaml b/docker/zookeeper/zookeeper.yaml
index 4b8501d524..d027f8e6d5 100644
--- a/docker/zookeeper/zookeeper.yaml
+++ b/docker/zookeeper/zookeeper.yaml
@@ -87,7 +87,7 @@ spec:
       containers:
       - name: zk
         imagePullPolicy: Always
-        image: thingsboard/zk:k8stest
+        image: thingsboard/zk:1.2.4
         ports:
         - containerPort: 2181
           name: client