diff --git a/charts/archiver/Chart.yaml b/charts/archiver/Chart.yaml
index 766b84f8928719fff9f30c0bbc701e4cb8476653..141dda9979dec4763ad1e562b9e491a1ed09220e 100644
--- a/charts/archiver/Chart.yaml
+++ b/charts/archiver/Chart.yaml
@@ -2,12 +2,12 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the HDB++ archiver for the MVP on Kubernetes
 name: archiver
-version: 0.2.4
+version: 0.2.5
 appVersion: 1.16.0
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.2
+  version: 0.2.3
   repository: file://../tango-util
 # The archiver cannot have the tango-base since we allow only one level in the chart hierarchies
 # - name: tango-base
diff --git a/charts/ska-docker/Chart.yaml b/charts/ska-docker/Chart.yaml
index c711115190e16645964bfbcffd6223a7450bc9ea..2eb249f610af7cb42213258e5ebeaf56823d32e9 100644
--- a/charts/ska-docker/Chart.yaml
+++ b/charts/ska-docker/Chart.yaml
@@ -2,14 +2,14 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: ska-docker
-version: 0.1.5
+version: 0.1.6
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-base
-  version: 0.2.5
+  version: 0.2.6
   repository: file://../tango-base
   condition: tango-base.enabled,global.sub-system.tango-base.enabled
 - name: archiver
-  version: 0.2.4
+  version: 0.2.5
   repository: file://../archiver
   condition: archiver.enabled,global.sub-system.archiver.enabled
diff --git a/charts/tango-base/Chart.yaml b/charts/tango-base/Chart.yaml
index 0ad6daa35bcab00998e19b1ee36f02551554344e..808bb576b33a786cd10880a9264ad5c9b00df9c1 100644
--- a/charts/tango-base/Chart.yaml
+++ b/charts/tango-base/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for deploying the TANGO base system on Kubernetes
 name: tango-base
-version: 0.2.5
+version: 0.2.6
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 dependencies:
 - name: tango-util
-  version: 0.2.2
+  version: 0.2.3
   repository: file://../tango-util
\ No newline at end of file
diff --git a/charts/tango-util/Chart.yaml b/charts/tango-util/Chart.yaml
index 41f80026d9867aa03eb7994f7bbff045b6f40acc..2a757c3752bd919be95eac56836637e972767651 100644
--- a/charts/tango-util/Chart.yaml
+++ b/charts/tango-util/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 description: A Helm chart library of utilities for TANGO deployents
 name: tango-util
 type: library
-appVersion: 0.2.2
-version: 0.2.2
+appVersion: 0.2.3
+version: 0.2.3
 icon: https://www.skatelescope.org/wp-content/uploads/2016/07/09545_NEW_LOGO_2014.png
 maintainers:
 - name: Matteo Di Carlo
diff --git a/charts/tango-util/templates/_deviceserver.yaml b/charts/tango-util/templates/_deviceserver.yaml
index 938b26331681ba81d033570d9598c32652d7ecec..7005d069589f686cb2062c424ccb302b412f1d1d 100644
--- a/charts/tango-util/templates/_deviceserver.yaml
+++ b/charts/tango-util/templates/_deviceserver.yaml
@@ -13,11 +13,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{tpl (.deviceserver.name | toString) $chart }}
+  name: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
   namespace: {{ .local.Release.Namespace }}
   labels:
 {{ toYaml $labels | indent 4 }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
     function: {{ .deviceserver.function }}
     domain: {{ .deviceserver.domain }}
     subsystem: {{ .local.Values.subsystem }}
@@ -26,18 +26,18 @@ metadata:
 spec:
   selector:
     subsystem: {{ .local.Values.subsystem }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
   clusterIP: None
 
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{tpl (.deviceserver.name | toString) $chart }}
+  name: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
   namespace: {{ .local.Release.Namespace }}
   labels:
 {{ toYaml $labels | indent 4 }}
-    component: {{tpl (.deviceserver.name | toString) $chart }}
+    component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
     function: {{ .deviceserver.function }}
     domain: {{ .deviceserver.domain }}
     subsystem: {{ .local.Values.subsystem }}
@@ -46,14 +46,14 @@ metadata:
 spec:
   selector:
     matchLabels:
-      component: {{tpl (.deviceserver.name | toString) $chart }}
+      component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
       subsystem: {{ .local.Values.subsystem }}
-  serviceName: {{tpl (.deviceserver.name | toString) $chart }}
+  serviceName: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
   replicas: 1
   template:
     metadata:
       labels:
-        component: {{tpl (.deviceserver.name | toString) $chart }}
+        component: {{tpl (.deviceserver.name | toString) $chart }}-{{ .instance | toString }}
         function: {{ .deviceserver.function }}
         domain: {{ .deviceserver.domain }}
         subsystem: {{ .local.Values.subsystem }}
@@ -74,7 +74,7 @@ spec:
           - --timeout=60
           - --strict
           - --
-          - echo databaseds ready
+          - echo {{ $device.host }} ready
 {{- if ($chart.Values.global.environment_variables) }}
         env:
 {{- range $index, $envvar := $chart.Values.global.environment_variables }}
diff --git a/docker/tango/hdbpp_viewer/Dockerfile b/docker/tango/hdbpp_viewer/Dockerfile
index d007e8c56a5311d02cc863576ee76220bfe91412..f3e3262ed77df396f771dd1550efb611bde5f788 100644
--- a/docker/tango/hdbpp_viewer/Dockerfile
+++ b/docker/tango/hdbpp_viewer/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
 
 USER root
 
diff --git a/docker/tango/mariadb_hdbpp/Dockerfile b/docker/tango/mariadb_hdbpp/Dockerfile
index f3b652ec2dd537ff1dfcace3bf5ce7803b24404b..e1bf779763c1eb40bd2192f781e1083de7b245c7 100644
--- a/docker/tango/mariadb_hdbpp/Dockerfile
+++ b/docker/tango/mariadb_hdbpp/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:10.4.10
 
 COPY resources/create_hdb++_mysql.sql docker-entrypoint-initdb.d/create_db.sql
 COPY resources/my.cnf /etc/mysql/conf.d
diff --git a/docker/tango/ska-python-buildenv/Dockerfile b/docker/tango/ska-python-buildenv/Dockerfile
index 71d06eb8854e9b14780db6f594ace6db82ee387e..46b772a688ca180cbb2fd1949c413d01d1a69254 100644
--- a/docker/tango/ska-python-buildenv/Dockerfile
+++ b/docker/tango/ska-python-buildenv/Dockerfile
@@ -9,7 +9,7 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 
 USER root
 
diff --git a/docker/tango/ska-python-runtime/Dockerfile b/docker/tango/ska-python-runtime/Dockerfile
index dbc9186f0fdd432654fe386f7db1bb1f2024c28a..c265964792845da7e9a7eb6120a9f1b9db8d742a 100644
--- a/docker/tango/ska-python-runtime/Dockerfile
+++ b/docker/tango/ska-python-runtime/Dockerfile
@@ -5,9 +5,9 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
 
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 USER root
 
 # Permanently install Python and PyTango runtime dependencies:
diff --git a/docker/tango/tango-admin/Dockerfile b/docker/tango/tango-admin/Dockerfile
index 493e7c1a3e5071280f8707a1969bf0cb534c37d6..9482ce4ed1679afed131ba5c2091649390e97b79 100644
--- a/docker/tango/tango-admin/Dockerfile
+++ b/docker/tango/tango-admin/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:9.3.4-rc7
 
 ENTRYPOINT ["/usr/local/bin/tango_admin"]
 
diff --git a/docker/tango/tango-archiver/Dockerfile b/docker/tango/tango-archiver/Dockerfile
index 1a71c9a49affdb3784c1ba6dd3d8742d82906345..7e6e63498c58f1b2dd6fb92a24742f4e6b79616e 100644
--- a/docker/tango/tango-archiver/Dockerfile
+++ b/docker/tango/tango-archiver/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 
 USER root
 
diff --git a/docker/tango/tango-cpp/Dockerfile b/docker/tango/tango-cpp/Dockerfile
index ef07fc9c4bba0d205d85e2a11683fdd5a377d6fa..b9afa2fa6dc9d4f7974b18f6c72f8c258898e37e 100644
--- a/docker/tango/tango-cpp/Dockerfile
+++ b/docker/tango/tango-cpp/Dockerfile
@@ -5,7 +5,7 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:9.3.3.1 as buildenv
 
 RUN TANGO_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/tango-cs/tango-9.3.4-rc7.tar.gz \
     # Speed up image builds by adding apt proxy if detected on host
diff --git a/docker/tango/tango-databaseds/Dockerfile b/docker/tango/tango-databaseds/Dockerfile
index c247368238e24e6ef1620e2a9918ab837c933ce6..6bb975f9433e9251b8b01c17abe7220b5b128d3a 100644
--- a/docker/tango/tango-databaseds/Dockerfile
+++ b/docker/tango/tango-databaseds/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:9.3.4-rc7
 
 ENTRYPOINT ["/usr/local/bin/DataBaseds"]
 
diff --git a/docker/tango/tango-dependencies/.release b/docker/tango/tango-dependencies/.release
index af544554bbe26d7ee06b680a9fd919f0c06a893d..69e50a37d477836020fe7fca597085099c954e60 100644
--- a/docker/tango/tango-dependencies/.release
+++ b/docker/tango/tango-dependencies/.release
@@ -1,2 +1,2 @@
-release=9.3.3
-tag=tango-dependencies-9.3.3
+release=9.3.3.1
+tag=tango-dependencies-9.3.3.1
diff --git a/docker/tango/tango-dependencies/Dockerfile b/docker/tango/tango-dependencies/Dockerfile
index 0acb2b7069fb8f3d502901976399ff1a83b770f3..4ee7851db73f9fba28d8a5cf7f299f1ffec32b3d 100644
--- a/docker/tango/tango-dependencies/Dockerfile
+++ b/docker/tango/tango-dependencies/Dockerfile
@@ -41,7 +41,7 @@ RUN CPPZMQ_DOWNLOAD_URL=https://github.com/zeromq/cppzmq/archive/v4.4.1.tar.gz \
     && tar xf cppzmq.tar.gz -C /usr/src/cppzmq --strip-components=1 \
     && mkdir build \
     && cd build \
-    && cmake .. \
+    && cmake -DCPPZMQ_BUILD_TESTS=OFF .. \
     && make -j4 install \
     && apt-get purge -y --auto-remove $buildDeps \
     && rm -r /usr/src/cppzmq
diff --git a/docker/tango/tango-dsconfig/Dockerfile b/docker/tango/tango-dsconfig/Dockerfile
index f5479d16c77a9b8236fd9c59da10b67223e23305..43a75610ef9eb97e8f4c6072d06bff9181d27393 100644
--- a/docker/tango/tango-dsconfig/Dockerfile
+++ b/docker/tango/tango-dsconfig/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 
 USER root
 
diff --git a/docker/tango/tango-itango/Dockerfile b/docker/tango/tango-itango/Dockerfile
index de855437ab6c585910c576261be237a12ae290d9..4a623e0faa903e25224e1dfeba8da6aa389c64b5 100644
--- a/docker/tango/tango-itango/Dockerfile
+++ b/docker/tango/tango-itango/Dockerfile
@@ -1,8 +1,8 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
 
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:9.3.2.1
 
 # create ipython profile to so that itango doesn't fail if ipython hasn't run yet
 
diff --git a/docker/tango/tango-java/Dockerfile b/docker/tango/tango-java/Dockerfile
index 080a7eb946b3644b6923fad945243daa80875e3e..1f1005a98726fd697ff9fe07dda8d090c74b27a4 100644
--- a/docker/tango/tango-java/Dockerfile
+++ b/docker/tango/tango-java/Dockerfile
@@ -5,7 +5,7 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:9.3.3.1
 
 RUN JAVA_DOWNLOAD_URL=https://nexus.engageska-portugal.pt/repository/raw/java/jre-8u221-linux-x64.tar.gz \
     && mkdir /usr/java \
diff --git a/docker/tango/tango-jive/Dockerfile b/docker/tango/tango-jive/Dockerfile
index 14f2cb953d041ae8b3b2f33b6ffa72af585da80c..dd9ea0f089ada596bb13be298426d4e390784c4d 100644
--- a/docker/tango/tango-jive/Dockerfile
+++ b/docker/tango/tango-jive/Dockerfile
@@ -1,5 +1,5 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
 
 ENTRYPOINT ["/usr/local/bin/jive"]
diff --git a/docker/tango/tango-libtango/Dockerfile b/docker/tango/tango-libtango/Dockerfile
index b8e68fc527aeb1e138182c679ac1fb8edb501dfd..bc2ac9ce473f6163764c6d0ecb8899109d24c3b7 100644
--- a/docker/tango/tango-libtango/Dockerfile
+++ b/docker/tango/tango-libtango/Dockerfile
@@ -1,4 +1,4 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 
diff --git a/docker/tango/tango-pogo/Dockerfile b/docker/tango/tango-pogo/Dockerfile
index 268e6d9ca124bd2cb1678058c936065f58a33bb9..5f4b0b75e65b2baab5dfa169aa0ba755c3e364bb 100644
--- a/docker/tango/tango-pogo/Dockerfile
+++ b/docker/tango/tango-pogo/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
 
 USER root
 
diff --git a/docker/tango/tango-pytango/Dockerfile b/docker/tango/tango-pytango/Dockerfile
index 48297be66ab34ba7ffd6c7d6bcff1beec1b674ed..1ffc4f6447658da0ccb4d183a1f73bbed3b92ba8 100644
--- a/docker/tango/tango-pytango/Dockerfile
+++ b/docker/tango/tango-pytango/Dockerfile
@@ -1,4 +1,4 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:9.3.2.1
diff --git a/docker/tango/tango-rest/Dockerfile b/docker/tango/tango-rest/Dockerfile
index 5af7a3c927c0848f4bfbca57f605af716f1b6cd0..7e4dbb5f076cf2f0f2bfab23cddbdd8c22e6ef45 100644
--- a/docker/tango/tango-rest/Dockerfile
+++ b/docker/tango/tango-rest/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:latest as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dependencies:9.3.3.1 as buildenv
 
 RUN MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releases/download/rest-server-1.14/rest-server-1.14.jar \
     && DOCKERHOST=`awk '/^[a-z]+[0-9]+\t00000000/ { printf("%d.%d.%d.%d", "0x" substr($3, 7, 2), "0x" substr($3, 5, 2), "0x" substr($3, 3, 2), "0x" substr($3, 1, 2)) }' < /proc/net/route` \
@@ -15,7 +15,7 @@ RUN MTANGOREST_DOWNLOAD_URL=https://github.com/tango-controls/rest-server/releas
     && curl -fsSL "$MTANGOREST_DOWNLOAD_URL" -o mtangorest.jar \
     && apt-get purge -y --auto-remove $buildDeps
 
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
 
 COPY --from=buildenv /usr/local/lib/tango/mtangorest.jar /usr/local/lib/tango/mtangorest.jar
 
diff --git a/docker/tango/tango-starter/Dockerfile b/docker/tango/tango-starter/Dockerfile
index da182cdfe4aeb35aca8f049853530cb85a348991..049fd6999d63e6e702556dd527f58a7453634de7 100644
--- a/docker/tango/tango-starter/Dockerfile
+++ b/docker/tango/tango-starter/Dockerfile
@@ -1,6 +1,6 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4-rc7
 
 USER root
 
diff --git a/docker/tango/tango-test/Dockerfile b/docker/tango/tango-test/Dockerfile
index 82846e61883eacfcea40c3a2f29e19431fc6f724..cf4dfa2c45a9195cd383248714c0852062572060 100644
--- a/docker/tango/tango-test/Dockerfile
+++ b/docker/tango/tango-test/Dockerfile
@@ -1,5 +1,5 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-libtango:9.3.4-rc7
 
 ENTRYPOINT ["/usr/local/bin/TangoTest"]
diff --git a/docker/tango/tango-vnc/Dockerfile b/docker/tango/tango-vnc/Dockerfile
index 95145e733760b6db823082648b25166396f4d21d..c0af0543b6a5e7d7d51f2cfa91d0af22cf058dd7 100644
--- a/docker/tango/tango-vnc/Dockerfile
+++ b/docker/tango/tango-vnc/Dockerfile
@@ -5,7 +5,7 @@
 #
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3
 
 USER root
 
diff --git a/docker/tango/tango-vscode/Dockerfile b/docker/tango/tango-vscode/Dockerfile
index ff27ff75693dc756f2c03c40583875fae19eda4f..663908f436201a5d9a6c2eacc86e3217c2c773ab 100644
--- a/docker/tango/tango-vscode/Dockerfile
+++ b/docker/tango/tango-vscode/Dockerfile
@@ -1,7 +1,7 @@
 ARG DOCKER_REGISTRY_USER
 ARG DOCKER_REGISTRY_HOST
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:latest as buildenv
-FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:latest
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-buildenv:9.3.2.1 as buildenv
+FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/ska-python-runtime:9.3.2.1
 
 USER root