diff --git a/docker-compose/device-pcc.yml b/docker-compose/device-pcc.yml
index 026ceff8ded94fb2d6d8951e6f8b33b758dbb467..47f2c9b22089e1162e9ca10737ea11aa27a4b32c 100644
--- a/docker-compose/device-pcc.yml
+++ b/docker-compose/device-pcc.yml
@@ -19,6 +19,8 @@ services:
     # being shared among services.
     build:
         context: lofar-device-base
+        args:
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
     container_name: ${CONTAINER_NAME_PREFIX}device-pcc
     network_mode: ${NETWORK_MODE}
     volumes:
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 30e069a5eb0d38c9ccb1e9dbe1ffaf678dd0627c..13288630491032d2cb7f550177dc421c210561b3 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -19,6 +19,8 @@ services:
     # being shared among services.
     build:
         context: lofar-device-base
+        args:
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
     container_name: ${CONTAINER_NAME_PREFIX}device-sdp
     network_mode: ${NETWORK_MODE}
     volumes:
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index 4c12fe3a00fe8ee5fda3a26668bc24adcbf25a72..1a8547baf830bfd893177049017f9aece28afa88 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:latest
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
     container_name: ${CONTAINER_NAME_PREFIX}itango
     network_mode: ${NETWORK_MODE}
     volumes:
diff --git a/docker-compose/itango/Dockerfile b/docker-compose/itango/Dockerfile
index 010d408bae1c1714af978fd5aec71d775d36d1cc..044ae985c4d1d45c26a6c00f6c3a455b93187cff 100644
--- a/docker-compose/itango/Dockerfile
+++ b/docker-compose/itango/Dockerfile
@@ -1,7 +1,5 @@
-ARG VERSION=9.3.3.7
-ARG DOCKER_REGISTRY_HOST=artefact.skatelescope.org
-ARG DOCKER_REGISTRY_USER=ska-tango-images
-FROM $DOCKER_REGISTRY_HOST/$DOCKER_REGISTRY_USER/tango-itango:${VERSION}
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
 
 RUN sudo apt-get -y update && \
     sudo apt-get -y upgrade && \
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index 0ac641b22f78a6a1d332e572dc3d9b6db470a5bf..9c4c8053c7d397733a0ba73402eb3ec54b98a9b2 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -15,6 +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
     container_name: ${CONTAINER_NAME_PREFIX}jupyter
     network_mode: ${NETWORK_MODE}
     volumes:
diff --git a/docker-compose/jupyter/Dockerfile b/docker-compose/jupyter/Dockerfile
index aa10824264aaa8de72a0e2fd20fbbc7bd2193f75..7f043d4493e71fff9659dc5ee26cd0b716cef247 100644
--- a/docker-compose/jupyter/Dockerfile
+++ b/docker-compose/jupyter/Dockerfile
@@ -1,5 +1,5 @@
-ARG VERSION=9.3.3.7
-FROM artefact.skatelescope.org/ska-tango-images/tango-itango:${VERSION}
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
 
 # UID if the user that this container will run under. This is needed to give directories
 # that are needed for temporary storage the proper owner and access rights.
diff --git a/docker-compose/lofar-device-base.yml b/docker-compose/lofar-device-base.yml
index 3d40f0f63554222907e6094bc61f1342cc8fabfa..18c8ef36bb028be8bcb92c5fc7e17dd045d36857 100644
--- a/docker-compose/lofar-device-base.yml
+++ b/docker-compose/lofar-device-base.yml
@@ -17,5 +17,7 @@ services:
     image: lofar-device-base
     build:
         context: lofar-device-base
+        args:
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-itango:9.3.3.7
     container_name: ${CONTAINER_NAME_PREFIX}lofar-device-base
     network_mode: ${NETWORK_MODE}
diff --git a/docker-compose/lofar-device-base/Dockerfile b/docker-compose/lofar-device-base/Dockerfile
index ddf83de3642ccfddd09ccb2e98a71d69c2d3d799..34dde933732b08f6986149210fa9a497fb371737 100644
--- a/docker-compose/lofar-device-base/Dockerfile
+++ b/docker-compose/lofar-device-base/Dockerfile
@@ -1,5 +1,5 @@
-ARG VERSION=9.3.3.7
-FROM artefact.skatelescope.org/ska-tango-images/tango-itango:${VERSION}
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
 
 RUN sudo apt-get update && sudo apt-get install -y git && sudo apt-get clean