diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index 9d5d87f42f92a16d859c219a657ef87e7e34284d..5d0f8c92c4fb633c5883df244158e8126ddd5215 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -37,7 +37,7 @@ services:
     image: hdbpp
     build:
         context: hdbpp
-        args: 
+        args:
             SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
     container_name: ${CONTAINER_NAME_PREFIX}hdbpp
     networks:
@@ -55,8 +55,9 @@ services:
     image: hdbppts-cm
     build:
         context: hdbppts-cm
-        args: 
-            SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbpp:latest
+        args:
+            # TODO (Stefano): replace image tag with 'latest'
+            SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbpp:l2ss-822-cache-archiver-ts-docker-image
     container_name: ${CONTAINER_NAME_PREFIX}hdbppts-cm
     networks:
       - control    
@@ -86,8 +87,9 @@ services:
     image: hdbppts-es
     build:
         context: hdbppts-es
-        args: 
-            SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbppts-cm:latest
+        args:
+            # TODO (Stefano): replace image tag with 'latest'
+            SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbppts-cm:l2ss-822-cache-archiver-ts-docker-image
     container_name: ${CONTAINER_NAME_PREFIX}hdbppts-es
     networks:
       - control