diff --git a/docker/cassandra-setup/Makefile b/docker/cassandra-setup/Makefile
index b90a1f1e44..7990a3e7e8 100644
--- a/docker/cassandra-setup/Makefile
+++ b/docker/cassandra-setup/Makefile
@@ -1,4 +1,4 @@
-VERSION=2.0.1
+VERSION=2.1.0
 PROJECT=thingsboard
 APP=cassandra-setup
 
diff --git a/docker/cassandra/Makefile b/docker/cassandra/Makefile
index 1ac51fcccf..d1fb67705f 100644
--- a/docker/cassandra/Makefile
+++ b/docker/cassandra/Makefile
@@ -1,4 +1,4 @@
-VERSION=2.0.1
+VERSION=2.1.0
 PROJECT=thingsboard
 APP=cassandra
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index b7a715e73a..89a83696f3 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,7 +18,7 @@ version: '2'
 
 services:
   tb:
-    image: "thingsboard/application:2.0.1"
+    image: "thingsboard/application:2.1.0"
     ports:
       - "8080:8080"
       - "1883:1883"
diff --git a/docker/k8s/cassandra-setup.yaml b/docker/k8s/cassandra-setup.yaml
index eefc148427..381df77e65 100644
--- a/docker/k8s/cassandra-setup.yaml
+++ b/docker/k8s/cassandra-setup.yaml
@@ -22,7 +22,7 @@ spec:
   containers:
   - name: cassandra-setup
     imagePullPolicy: Always
-    image: thingsboard/cassandra-setup:2.0.1
+    image: thingsboard/cassandra-setup:2.1.0
     env:
     - name: ADD_DEMO_DATA
       value: "true"
diff --git a/docker/k8s/cassandra.yaml b/docker/k8s/cassandra.yaml
index 04cafcb74a..3165bb1a7a 100644
--- a/docker/k8s/cassandra.yaml
+++ b/docker/k8s/cassandra.yaml
@@ -54,7 +54,7 @@ spec:
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: cassandra
-        image: thingsboard/cassandra:2.0.1
+        image: thingsboard/cassandra:2.1.0
         imagePullPolicy: Always
         ports:
         - containerPort: 7000
diff --git a/docker/k8s/tb.yaml b/docker/k8s/tb.yaml
index 947afb46e0..f38e1f12b1 100644
--- a/docker/k8s/tb.yaml
+++ b/docker/k8s/tb.yaml
@@ -84,7 +84,7 @@ spec:
       containers:
       - name: tb
         imagePullPolicy: Always
-        image: thingsboard/application:2.0.1
+        image: thingsboard/application:2.1.0
         ports:
         - containerPort: 8080
           name: ui
diff --git a/docker/k8s/zookeeper.yaml b/docker/k8s/zookeeper.yaml
index 744c071797..ae33ea2efa 100644
--- a/docker/k8s/zookeeper.yaml
+++ b/docker/k8s/zookeeper.yaml
@@ -87,7 +87,7 @@ spec:
       containers:
       - name: zk
         imagePullPolicy: Always
-        image: thingsboard/zk:2.0.1
+        image: thingsboard/zk:2.1.0
         ports:
         - containerPort: 2181
           name: client
diff --git a/docker/tb/Makefile b/docker/tb/Makefile
index 5e0fcf1c58..96803abf58 100644
--- a/docker/tb/Makefile
+++ b/docker/tb/Makefile
@@ -1,4 +1,4 @@
-VERSION=2.0.1
+VERSION=2.1.0
 PROJECT=thingsboard
 APP=application
 
diff --git a/docker/zookeeper/Makefile b/docker/zookeeper/Makefile
index 1d74b0dc37..5c58a74cf2 100644
--- a/docker/zookeeper/Makefile
+++ b/docker/zookeeper/Makefile
@@ -1,4 +1,4 @@
-VERSION=2.0.1
+VERSION=2.1.0
 PROJECT=thingsboard
 APP=zk
 
diff --git a/ui/package.json b/ui/package.json
index 495923799d..06b7feea78 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thingsboard",
   "private": true,
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "Thingsboard UI",
   "licenses": [
     {