diff --git a/docker-compose/.env b/docker-compose/.env
index fd258fde0d7703c5789a399aeef76289bd04bb6f..85ebd21e4cfc0392b1f3f4452f22c861f1d304fe 100644
--- a/docker-compose/.env
+++ b/docker-compose/.env
@@ -2,3 +2,14 @@ DOCKER_REGISTRY_HOST=artefact.skao.int
 DOCKER_REGISTRY_USER=ska-tango-images
 LOCAL_DOCKER_REGISTRY_HOST=git.astron.nl:5000
 LOCAL_DOCKER_REGISTRY_USER=lofar2.0/tango
+
+TANGO_ARCHIVER_VERSION=2021-05-28
+TANGO_CPP_VERSION=9.3.5
+TANGO_DB_VERSION=10.4.11
+TANGO_DSCONFIG_VERSION=1.5.1
+TANGO_HDBPP_VIEWER_VERSION=2021-05-28
+TANGO_ITANGO_VERSION=9.3.5
+TANGO_JAVA_VERSION=9.3.4
+TANGO_POGO_VERSION=9.6.32
+TANGO_REST_VERSION=1.14.2
+TANGO_STARTER_VERSION=2021-05-28
diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index 08d90a113d590a2ebb0e89206cb615048473556f..41d5df160e011ca1aad79828bf2fd3c941958620 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -36,7 +36,7 @@ services:
                hdbppes-srv 01"
 
   hdbpp-cm:
-      image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28
+      image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:${TANGO_ARCHIVER_VERSION}
       networks:
       - control
       container_name: hdbpp-cm
@@ -54,7 +54,7 @@ services:
                hdbppcm-srv 01"
 
   dsconfig:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-dsconfig:1.5.0.6
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-dsconfig:${TANGO_DSCONFIG_VERSION}
     container_name: dsconfig
     networks:
       - control
diff --git a/docker-compose/astor.yml b/docker-compose/astor.yml
index 1d86575d48f8a5fdbe1506a1cf7885941181f608..7010a82afa2fbcf5cb3dd797bda384bb516354f8 100644
--- a/docker-compose/astor.yml
+++ b/docker-compose/astor.yml
@@ -13,7 +13,7 @@ version: '2'
 
 services:
   astor:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-java:${TANGO_JAVA_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}astor
     networks:
       - control
@@ -32,7 +32,7 @@ services:
       - /usr/local/bin/astor
 
   starter-example:
-    image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-starter:2021-05-28
+    image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-starter:${TANGO_STARTER_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}starter-example
     networks:
       - control
diff --git a/docker-compose/device-pcc.yml b/docker-compose/device-pcc.yml
index 2b7c14064436fc0128cf0e0f7cfb0750a13e72e4..3dc69f20b7aa7a670ed9a7b1e17cb3032b849957 100644
--- a/docker-compose/device-pcc.yml
+++ b/docker-compose/device-pcc.yml
@@ -20,7 +20,7 @@ services:
     build:
         context: lofar-device-base
         args:
-            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}device-pcc
     networks:
       - control
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index ec51d4fa12784a9ccd0cd42cf3cba4260c61a529..27d6a33cf94985f18bcbcaafe21078aa7aa92e36 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -20,7 +20,7 @@ services:
     build:
         context: lofar-device-base
         args:
-            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}device-sdp
     networks:
       - control
diff --git a/docker-compose/device-sst.yml b/docker-compose/device-sst.yml
index 992980bcaafd8de43e85c56d134f9736944e2eac..7a669cf0a67aea39474f567364b7cf307ecdb558 100644
--- a/docker-compose/device-sst.yml
+++ b/docker-compose/device-sst.yml
@@ -20,7 +20,7 @@ services:
     build:
         context: lofar-device-base
         args:
-            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}device-sst
     networks:
         - control
diff --git a/docker-compose/hdbpp_viewer.yml b/docker-compose/hdbpp_viewer.yml
index c7a54f7e6b027e96ebae55d0863981fe85541b54..481879729621d5c5828abddbbd047182d9b16278 100644
--- a/docker-compose/hdbpp_viewer.yml
+++ b/docker-compose/hdbpp_viewer.yml
@@ -10,7 +10,7 @@ version: '2'
 
 services:
   hdbpp-viewer:
-    image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbpp_viewer:2021-05-28
+    image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbpp_viewer:${TANGO_HDBPP_VIEWER_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}hdbpp-viewer
     networks:
       - control
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index cd5283f234606276d9b54e4f4348d306e25597b7..25a551464e30f5c8803f290c281c34c810f7188c 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -17,7 +17,7 @@ services:
     build:
         context: itango
         args:
-            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}itango
     networks:
       - control
diff --git a/docker-compose/jive.yml b/docker-compose/jive.yml
index 82a16bec6f904f54ef19414c111915cdbc54990b..b810073e6a2ddf691b88a47c2d805331605379e8 100644
--- a/docker-compose/jive.yml
+++ b/docker-compose/jive.yml
@@ -18,7 +18,7 @@ version: '2'
 
 services:
   jive:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-java:${TANGO_JAVA_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}jive
     network_mode: host
     volumes:
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index cbd2ab9ce968c0d0e7c512b8467310b02b9dd053..36cc0acbcd32631a9cf8e6bb1f10ecfb77362cf0 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -15,7 +15,7 @@ services:
         context: jupyter
         args:
             CONTAINER_EXECUTION_UID: ${CONTAINER_EXECUTION_UID}
-            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}jupyter
     networks:
       - control
diff --git a/docker-compose/lofar-device-base.yml b/docker-compose/lofar-device-base.yml
index 2a2cdc4dde93fcc8045361600621fab0ea5bd9f3..22ecabca37c526867afe52461d7ce432964f8385 100644
--- a/docker-compose/lofar-device-base.yml
+++ b/docker-compose/lofar-device-base.yml
@@ -18,7 +18,7 @@ services:
     build:
         context: lofar-device-base
         args:
-            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base
     networks:
       - control
diff --git a/docker-compose/logviewer.yml b/docker-compose/logviewer.yml
index cea36402729fd9157e8c5e572ebca44a602aa6a0..bf0c9b2d51cbdb7334a579184114de6925fd37a1 100644
--- a/docker-compose/logviewer.yml
+++ b/docker-compose/logviewer.yml
@@ -12,7 +12,7 @@ version: '2'
 
 services:
   logviewer:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-java:${TANGO_JAVA_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}logviewer
     networks:
       - control
diff --git a/docker-compose/pogo.yml b/docker-compose/pogo.yml
index 6f87f640a2977b53a4b5ed27d98c2cfd5ccca68a..2029874a5247ead93054a6f83e8185ea01be2487 100644
--- a/docker-compose/pogo.yml
+++ b/docker-compose/pogo.yml
@@ -20,7 +20,7 @@ volumes:
 
 services:
   pogo:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-pogo:9.6.31.2
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-pogo:${TANGO_POGO_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}pogo
     networks:
       - control
diff --git a/docker-compose/rest.yml b/docker-compose/rest.yml
index f5bfbd329d6223f578c6bd5ea1b255a69527b64c..b76ed39c5319b10403a93db6736ce8d640380efc 100644
--- a/docker-compose/rest.yml
+++ b/docker-compose/rest.yml
@@ -13,7 +13,7 @@ version: '2'
 
 services:
   rest:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-rest:1.14.1.2
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-rest:${TANGO_REST_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}tango-rest
     networks:
       - control
diff --git a/docker-compose/tango.yml b/docker-compose/tango.yml
index 0cde93b0c9b6690d48f427d5b31afa399b150022..b3a860d7b55ea71c5e2bc23895b7b57040e3f216 100644
--- a/docker-compose/tango.yml
+++ b/docker-compose/tango.yml
@@ -15,7 +15,7 @@ volumes:
 
 services:
   tangodb:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-db:10.4.10
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-db:${TANGO_DB_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}tangodb
     networks:
       - control
@@ -31,7 +31,7 @@ services:
     restart: on-failure
 
   databaseds:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:9.3.4.2
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}databaseds
     networks:
       - control
diff --git a/docker-compose/tangotest.yml b/docker-compose/tangotest.yml
index 30e0575026f3f203e6da739c9538432efad99ce3..3a44fc61b73b18a78d9e5bbd6a6fef6ac2d648fd 100644
--- a/docker-compose/tangotest.yml
+++ b/docker-compose/tangotest.yml
@@ -4,14 +4,14 @@
 # Defines:
 #   - tangotest: TANGO test device server
 #
-# Requires: 
+# Requires:
 #   - tango.yml
 #
 version: '2'
 
 services:
   tangotest:
-    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:9.3.3.2
+    image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-java:${TANGO_JAVA_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}tangotest
     networks:
       - control