diff --git a/docker/tango/tango-archiver-ts/Dockerfile b/docker/tango/tango-archiver-ts/Dockerfile
index 6ca58718f42a9c3b36bc2f8cf9cce8496acf1d24..98c3190c0ade4fb0b7457e6a983fc675e5eb8c3c 100644
--- a/docker/tango/tango-archiver-ts/Dockerfile
+++ b/docker/tango/tango-archiver-ts/Dockerfile
@@ -30,8 +30,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
         libpq-dev \
         libpqxx-dev       
         
-#RUN git clone -b master https://github.com/tango-controls-hdbpp/libhdbpp.git
-RUN git clone -b master https://github.com/Diego91RA/libhdbpp.git
+RUN git clone -b v2.0.0 https://github.com/Diego91RA/libhdbpp.git
 
 RUN cd libhdbpp \
  && mkdir build \
@@ -60,8 +59,8 @@ RUN cd libhdbpp/build \
     --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
     make install
 
-#RUN git clone -b master --recurse-submodules https://github.com/tango-controls-hdbpp/libhdbpp-timescale.git
 RUN git clone -b master --recurse-submodules https://github.com/Diego91RA/libhdbpp-timescale.git
+RUN cd libhdbpp-timescale && git checkout 85c03657d4518e876869b322d6a50c46875a1300
 
 RUN cd libhdbpp-timescale \
  && mkdir -p build \
@@ -90,8 +89,7 @@ RUN cd libhdbpp-timescale/build \
     --requires="libpq5" \
     make install  
 
-#RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-cm.git
-RUN git clone -b master https://github.com/Diego91RA/hdbpp-cm.git
+RUN git clone -b v2.0.0 https://github.com/Diego91RA/hdbpp-cm.git
 
 RUN cd hdbpp-cm \
  && mkdir -p build \
@@ -120,8 +118,8 @@ RUN cd hdbpp-cm/build \
     --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
     make install
 
-#RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-es.git
 RUN git clone -b master https://github.com/Diego91RA/hdbpp-es.git
+RUN cd hdbpp-es && git checkout 473cbfbd7af76851bbf6ca2fcf5e4880e9f8e437
 
 RUN cd hdbpp-es \
  && mkdir -p build \