diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index cdbf1b03788117308fa97227e3d83b452a77395a..e88a00eb48efa1a9008bd6cb4945887213aba3ec 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -35,6 +35,8 @@ services:
     image: hdbppts-cm
     build:
         context: tango-archiver-ts
+        args: 
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}hdbppts-cm
     networks:
       - control    
@@ -63,6 +65,8 @@ services:
     image: hdbppts-es
     build:
         context: tango-archiver-ts
+        args: 
+            SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}hdbppts-es
     networks:
       - control    
diff --git a/docker-compose/tango-archiver-ts/Dockerfile b/docker-compose/tango-archiver-ts/Dockerfile
index b6f44b0ba9e08d06538165be9283fadb18c4cbef..57f7bd7086fb41825b15a2781b24c5454d46f97a 100644
--- a/docker-compose/tango-archiver-ts/Dockerfile
+++ b/docker-compose/tango-archiver-ts/Dockerfile
@@ -1,7 +1,5 @@
-#ARG DOCKER_REGISTRY_USER
-#ARG DOCKER_REGISTRY_HOST
-#FROM ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-cpp:latest
-FROM artefact.skao.int/ska-tango-images-tango-cpp:9.3.9
+ARG SOURCE_IMAGE
+FROM ${SOURCE_IMAGE}
 
 USER root