diff --git a/docker-compose/archiver-timescale.yml b/docker-compose/archiver-timescale.yml
index 5654716d8d8931bbb490333d830f5977d768cfed..ff46d103cf675edcd38605f46355e8dbec579052 100644
--- a/docker-compose/archiver-timescale.yml
+++ b/docker-compose/archiver-timescale.yml
@@ -88,7 +88,7 @@ services:
         context: hdbppts-es
         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
+            SOURCE_IMAGE: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/hdbpp:l2ss-822-cache-archiver-ts-docker-image
     container_name: ${CONTAINER_NAME_PREFIX}hdbppts-es
     networks:
       - control    
diff --git a/docker-compose/hdbppts-es/Dockerfile b/docker-compose/hdbppts-es/Dockerfile
index cd03ffbc2b9aadf96deeb512f1db4d0e58768f01..bd74e1b97e41a1d1ffa4be13891435e9abb6252a 100644
--- a/docker-compose/hdbppts-es/Dockerfile
+++ b/docker-compose/hdbppts-es/Dockerfile
@@ -39,10 +39,8 @@ RUN apt-get update && \
 
 RUN dpkg -i /libhdbpp/build/libhdbpp_2.0.0-SNAPSHOT_amd64.deb
 RUN dpkg -i /libhdbpp-timescale/build/libhdbpp-timescale_2.0.0-SNAPSHOT_amd64.deb
-RUN dpkg -i /hdbpp-cm/build/hdbpp-cm_2.0.0-SNAPSHOT_amd64.deb
 RUN dpkg -i /hdbpp-es/build/hdbpp-es_2.0.0-SNAPSHOT_amd64.deb
 
 RUN ldconfig
 
-RUN mv /usr/local/bin/hdb++cm-srv /usr/local/bin/hdbppcm-srv
 RUN mv /usr/local/bin/hdb++es-srv /usr/local/bin/hdbppes-srv