diff --git a/msa/js-executor/docker/Dockerfile b/msa/js-executor/docker/Dockerfile
index 0934b4b1a1..620d712ad1 100644
--- a/msa/js-executor/docker/Dockerfile
+++ b/msa/js-executor/docker/Dockerfile
@@ -14,16 +14,13 @@
 # limitations under the License.
 #
 
-FROM node:16.13.1-bullseye-slim
-
-COPY start-js-executor.sh /tmp/
-
-RUN chmod a+x /tmp/*.sh \
-    && mv /tmp/start-js-executor.sh /usr/bin
+FROM node:16.15.1-bullseye-slim
 
 ENV NODE_ENV production
 ENV DOCKER_MODE true
 
+COPY start-js-executor.sh /tmp/
+
 WORKDIR ${pkg.installFolder}
 
 COPY ["src/package.json", "src/yarn.lock", "./"]
@@ -34,9 +31,10 @@ COPY src/api ./api
 COPY src/queue ./queue
 COPY src/server.js ./
 
-RUN chown -R node:node ${pkg.installFolder}
-
-RUN yarn install --production && yarn cache clean --all
+RUN chmod a+x /tmp/*.sh \
+    && mv /tmp/start-js-executor.sh /usr/bin \
+    && chown -R node:node ${pkg.installFolder} \
+    && yarn install --production && yarn cache clean --all
 
 USER node
 
diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index a910e4759f..8e376e1e15 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -71,7 +71,7 @@
                             <goal>install-node-and-yarn</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v16.13.1</nodeVersion>
+                            <nodeVersion>v16.15.1</nodeVersion>
                             <yarnVersion>v1.22.17</yarnVersion>
                         </configuration>
                     </execution>
diff --git a/msa/tb-node/docker/Dockerfile b/msa/tb-node/docker/Dockerfile
index 1881351b92..cbfbebf86c 100644
--- a/msa/tb-node/docker/Dockerfile
+++ b/msa/tb-node/docker/Dockerfile
@@ -14,13 +14,12 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
-
-RUN echo 'networkaddress.cache.ttl=60' >> /etc/java-11-openjdk/security/java.security
+FROM thingsboard/openjdk11:bullseye-slim
 
 COPY start-tb-node.sh ${pkg.name}.deb /tmp/
 
-RUN chmod a+x /tmp/*.sh \
+RUN echo 'networkaddress.cache.ttl=60' >> /etc/java-11-openjdk/security/java.security \
+    && chmod a+x /tmp/*.sh \
     && mv /tmp/start-tb-node.sh /usr/bin && \
     (yes | dpkg -i /tmp/${pkg.name}.deb) && \
     rm /tmp/${pkg.name}.deb && \
diff --git a/msa/tb/docker-cassandra/Dockerfile b/msa/tb/docker-cassandra/Dockerfile
index f61f070486..f3fa3146c0 100644
--- a/msa/tb/docker-cassandra/Dockerfile
+++ b/msa/tb/docker-cassandra/Dockerfile
@@ -14,37 +14,9 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
+FROM thingsboard/openjdk11:bullseye-slim
 
-RUN apt-get update
-RUN apt-get install -y curl nmap procps gnupg2
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null
-RUN curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null
-RUN curl -L https://downloads.apache.org/cassandra/KEYS | apt-key add -
 ENV PG_MAJOR=12
-RUN apt-get update
-RUN apt-get install -y cassandra cassandra-tools postgresql-12
-RUN update-rc.d cassandra disable
-RUN update-rc.d postgresql disable
-RUN sed -i.old '/ulimit/d' /etc/init.d/cassandra
-
-COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
-
-RUN chmod a+x /tmp/*.sh \
-    && mv /tmp/start-tb.sh /usr/bin \
-    && mv /tmp/upgrade-tb.sh /usr/bin \
-    && mv /tmp/install-tb.sh /usr/bin \
-    && mv /tmp/start-db.sh /usr/bin \
-    && mv /tmp/stop-db.sh /usr/bin
-
-RUN dpkg -i /tmp/${pkg.name}.deb
-RUN rm /tmp/${pkg.name}.deb
-
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-
-RUN mv /tmp/logback.xml ${pkg.installFolder}/conf \
-    && mv /tmp/${pkg.name}.conf ${pkg.installFolder}/conf
 
 ENV DATA_FOLDER=/data
 
@@ -69,23 +41,43 @@ ENV PATH=$PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 ENV PGLOG=/var/log/postgres
 ENV CASSANDRA_LOG=/var/log/cassandra
 
-# postgres config
-RUN mkdir -p $PGLOG
-RUN chown -R ${pkg.user}:${pkg.user} $PGLOG
-RUN chown -R ${pkg.user}:${pkg.user} /var/log/postgresql
-RUN chown -R ${pkg.user}:${pkg.user} /var/run/postgresql
+COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
 
+RUN apt-get update \
+    && apt-get install -y curl nmap procps gnupg2 \
+    && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \
+    && curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+    && echo 'deb http://downloads.apache.org/cassandra/debian 40x main' | tee --append /etc/apt/sources.list.d/cassandra.list > /dev/null \
+    && curl -L https://downloads.apache.org/cassandra/KEYS | apt-key add - \
+    && apt-get update \
+    && apt-get install -y cassandra cassandra-tools postgresql-12 \
+    && update-rc.d cassandra disable \
+    && update-rc.d postgresql disable \
+    && sed -i.old '/ulimit/d' /etc/init.d/cassandra \
+    && chmod a+x /tmp/*.sh \
+    && mv /tmp/start-tb.sh /usr/bin \
+    && mv /tmp/upgrade-tb.sh /usr/bin \
+    && mv /tmp/install-tb.sh /usr/bin \
+    && mv /tmp/start-db.sh /usr/bin \
+    && mv /tmp/stop-db.sh /usr/bin \
+    && dpkg -i /tmp/${pkg.name}.deb \
+    && rm /tmp/${pkg.name}.deb \
+    && systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || : \
+    && mv /tmp/logback.xml ${pkg.installFolder}/conf \
+    && mv /tmp/${pkg.name}.conf ${pkg.installFolder}/conf \
+# postgres config
+    && mkdir -p $PGLOG \
+    && chown -R ${pkg.user}:${pkg.user} $PGLOG \
+    && chown -R ${pkg.user}:${pkg.user} /var/log/postgresql \
+    && chown -R ${pkg.user}:${pkg.user} /var/run/postgresql \
 # cassandra config
-RUN rm -rf /var/lib/cassandra
-RUN chmod a+w /var/lib
-RUN chown -R ${pkg.user}:${pkg.user} $CASSANDRA_LOG
-
-
-RUN mkdir -p $DATA_FOLDER
-RUN chown -R ${pkg.user}:${pkg.user} $DATA_FOLDER
-RUN chown -R ${pkg.user}:${pkg.user} /var/log/${pkg.name}
-
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
+    && rm -rf /var/lib/cassandra \
+    && chmod a+w /var/lib \
+    && chown -R ${pkg.user}:${pkg.user} $CASSANDRA_LOG \
+    && mkdir -p $DATA_FOLDER \
+    && chown -R ${pkg.user}:${pkg.user} $DATA_FOLDER \
+    && chown -R ${pkg.user}:${pkg.user} /var/log/${pkg.name} \
+    && chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}
 
diff --git a/msa/tb/docker-postgres/Dockerfile b/msa/tb/docker-postgres/Dockerfile
index d70bc29b91..24c9200ea4 100644
--- a/msa/tb/docker-postgres/Dockerfile
+++ b/msa/tb/docker-postgres/Dockerfile
@@ -14,33 +14,9 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
+FROM thingsboard/openjdk11:bullseye-slim
 
-RUN apt-get update
-RUN apt-get install -y curl gnupg2
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null
-RUN curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 ENV PG_MAJOR 12
-RUN apt-get update
-RUN apt-get install -y postgresql-12
-RUN update-rc.d postgresql disable
-
-COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
-
-RUN chmod a+x /tmp/*.sh \
-    && mv /tmp/start-tb.sh /usr/bin \
-    && mv /tmp/upgrade-tb.sh /usr/bin \
-    && mv /tmp/install-tb.sh /usr/bin \
-    && mv /tmp/start-db.sh /usr/bin \
-    && mv /tmp/stop-db.sh /usr/bin
-
-RUN dpkg -i /tmp/${pkg.name}.deb
-RUN rm /tmp/${pkg.name}.deb
-
-RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
-
-RUN mv /tmp/logback.xml ${pkg.installFolder}/conf \
-    && mv /tmp/${pkg.name}.conf ${pkg.installFolder}/conf
 
 ENV DATA_FOLDER=/data
 
@@ -55,18 +31,35 @@ ENV SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:5432/thingsboard
 ENV SPRING_DATASOURCE_USERNAME=${pkg.user}
 ENV SPRING_DATASOURCE_PASSWORD=postgres
 
-
 ENV PGLOG=/var/log/postgres
-RUN mkdir -p $PGLOG
-RUN chown -R ${pkg.user}:${pkg.user} $PGLOG
 
-RUN chown -R ${pkg.user}:${pkg.user} /var/run/postgresql
-
-RUN mkdir -p /data
-RUN chown -R ${pkg.user}:${pkg.user} /data
+COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
 
-RUN chown -R ${pkg.user}:${pkg.user} /var/log/${pkg.name}
-RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
+RUN apt-get update \
+    && apt-get install -y curl gnupg2 \
+    && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(. /etc/os-release && echo -n $VERSION_CODENAME)-pgdg main" | tee --append /etc/apt/sources.list.d/pgdg.list > /dev/null \
+    && curl -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+    && apt-get update \
+    && apt-get install -y postgresql-12 \
+    && update-rc.d postgresql disable \
+    && chmod a+x /tmp/*.sh \
+    && mv /tmp/start-tb.sh /usr/bin \
+    && mv /tmp/upgrade-tb.sh /usr/bin \
+    && mv /tmp/install-tb.sh /usr/bin \
+    && mv /tmp/start-db.sh /usr/bin \
+    && mv /tmp/stop-db.sh /usr/bin \
+    && dpkg -i /tmp/${pkg.name}.deb \
+    && rm /tmp/${pkg.name}.deb \
+    && systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || : \
+    && mv /tmp/logback.xml ${pkg.installFolder}/conf \
+    && mv /tmp/${pkg.name}.conf ${pkg.installFolder}/conf \
+    && mkdir -p $PGLOG \
+    && chown -R ${pkg.user}:${pkg.user} $PGLOG \
+    && chown -R ${pkg.user}:${pkg.user} /var/run/postgresql \
+    && mkdir -p /data \
+    && chown -R ${pkg.user}:${pkg.user} /data \
+    && chown -R ${pkg.user}:${pkg.user} /var/log/${pkg.name} \
+    && chmod 555 ${pkg.installFolder}/bin/${pkg.name}.jar
 
 USER ${pkg.user}
 
diff --git a/msa/transport/coap/docker/Dockerfile b/msa/transport/coap/docker/Dockerfile
index 2d174a4827..8b1d5d7a0e 100644
--- a/msa/transport/coap/docker/Dockerfile
+++ b/msa/transport/coap/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
+FROM thingsboard/openjdk11:bullseye-slim
 
 COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/http/docker/Dockerfile b/msa/transport/http/docker/Dockerfile
index 8e0075738e..d17afe7f54 100644
--- a/msa/transport/http/docker/Dockerfile
+++ b/msa/transport/http/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
+FROM thingsboard/openjdk11:bullseye-slim
 
 COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/lwm2m/docker/Dockerfile b/msa/transport/lwm2m/docker/Dockerfile
index f0c92419d0..d6fa010a1a 100644
--- a/msa/transport/lwm2m/docker/Dockerfile
+++ b/msa/transport/lwm2m/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
+FROM thingsboard/openjdk11:bullseye-slim
 
 COPY start-tb-lwm2m-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/mqtt/docker/Dockerfile b/msa/transport/mqtt/docker/Dockerfile
index 378cd14dd5..d46af0138c 100644
--- a/msa/transport/mqtt/docker/Dockerfile
+++ b/msa/transport/mqtt/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
+FROM thingsboard/openjdk11:bullseye-slim
 
 COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/transport/snmp/docker/Dockerfile b/msa/transport/snmp/docker/Dockerfile
index 84d115f0d4..310d1b34e1 100644
--- a/msa/transport/snmp/docker/Dockerfile
+++ b/msa/transport/snmp/docker/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM thingsboard/openjdk11
+FROM thingsboard/openjdk11:bullseye-slim
 
 COPY start-tb-snmp-transport.sh ${pkg.name}.deb /tmp/
 
diff --git a/msa/web-ui/docker/Dockerfile b/msa/web-ui/docker/Dockerfile
index 96a6861701..f99509893f 100644
--- a/msa/web-ui/docker/Dockerfile
+++ b/msa/web-ui/docker/Dockerfile
@@ -14,16 +14,13 @@
 # limitations under the License.
 #
 
-FROM node:16.13.1-bullseye-slim
-
-COPY start-web-ui.sh /tmp/
-
-RUN chmod a+x /tmp/*.sh \
-    && mv /tmp/start-web-ui.sh /usr/bin
+FROM node:16.15.1-bullseye-slim
 
 ENV NODE_ENV production
 ENV DOCKER_MODE true
 
+COPY start-web-ui.sh /tmp/
+
 WORKDIR ${pkg.installFolder}
 
 COPY ["src/package.json", "src/yarn.lock", "./"]
@@ -33,9 +30,10 @@ COPY package/linux/conf ./config
 COPY web ./web
 COPY src/server.js ./
 
-RUN chown -R node:node ${pkg.installFolder}
-
-RUN yarn install --production && yarn cache clean --all
+RUN chmod a+x /tmp/*.sh \
+    && mv /tmp/start-web-ui.sh /usr/bin \
+    && chown -R node:node ${pkg.installFolder} \
+    && yarn install --production && yarn cache clean --all
 
 USER node
 
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index c949555d46..2319caa092 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -80,7 +80,7 @@
                             <goal>install-node-and-yarn</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v16.13.1</nodeVersion>
+                            <nodeVersion>v16.15.1</nodeVersion>
                             <yarnVersion>v1.22.17</yarnVersion>
                         </configuration>
                     </execution>
diff --git a/ui-ngx/pom.xml b/ui-ngx/pom.xml
index 66bf79951f..fce2719dc9 100644
--- a/ui-ngx/pom.xml
+++ b/ui-ngx/pom.xml
@@ -56,7 +56,7 @@
                             <goal>install-node-and-yarn</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v16.13.0</nodeVersion>
+                            <nodeVersion>v16.15.1</nodeVersion>
                             <yarnVersion>v1.22.17</yarnVersion>
                         </configuration>
                     </execution>