diff --git a/docker-compose/tango-archiver-ts/Dockerfile b/docker-compose/tango-archiver-ts/Dockerfile
index 98c3190c0ade4fb0b7457e6a983fc675e5eb8c3c..389db398f225d3754cfbf5aa2ea4411f9a349e6c 100644
--- a/docker-compose/tango-archiver-ts/Dockerfile
+++ b/docker-compose/tango-archiver-ts/Dockerfile
@@ -29,8 +29,11 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
         libpqxx-6.2 \
         libpq-dev \
         libpqxx-dev       
-        
-RUN git clone -b v2.0.0 https://github.com/Diego91RA/libhdbpp.git
+
+
+# ----------- LIBHDB++ -----------------------------
+
+RUN git clone -b master https://gitlab.com/tango-controls/hdbpp/donotusebadimport/libhdbpp.git
 
 RUN cd libhdbpp \
  && mkdir build \
@@ -59,8 +62,10 @@ RUN cd libhdbpp/build \
     --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
     make install
 
-RUN git clone -b master --recurse-submodules https://github.com/Diego91RA/libhdbpp-timescale.git
-RUN cd libhdbpp-timescale && git checkout 85c03657d4518e876869b322d6a50c46875a1300
+
+# ----------- LIBHDB++ TIMESCALE ---------------
+
+RUN git clone -b image_support --recurse-submodules https://github.com/tango-controls-hdbpp/libhdbpp-timescale.git
 
 RUN cd libhdbpp-timescale \
  && mkdir -p build \
@@ -89,7 +94,10 @@ RUN cd libhdbpp-timescale/build \
     --requires="libpq5" \
     make install  
 
-RUN git clone -b v2.0.0 https://github.com/Diego91RA/hdbpp-cm.git
+
+# ----------- HDB++ CONFIGURATION MANAGER ---------------
+
+RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-cm.git
 
 RUN cd hdbpp-cm \
  && mkdir -p build \
@@ -118,8 +126,10 @@ RUN cd hdbpp-cm/build \
     --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
     make install
 
-RUN git clone -b master https://github.com/Diego91RA/hdbpp-es.git
-RUN cd hdbpp-es && git checkout 473cbfbd7af76851bbf6ca2fcf5e4880e9f8e437
+
+# ----------- HDB++ EVENT SUBSCRIBER ---------------
+
+RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-es.git
 
 RUN cd hdbpp-es \
  && mkdir -p build \