diff --git a/docker/tango/tango-archiver/Dockerfile b/docker/tango/tango-archiver/Dockerfile
index 7e6e63498c58f1b2dd6fb92a24742f4e6b79616e..dfc75bfe8dabe2683691a88e233317e6ee551459 100644
--- a/docker/tango/tango-archiver/Dockerfile
+++ b/docker/tango/tango-archiver/Dockerfile
@@ -23,7 +23,14 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
         libmariadb-dev-compat libmariadb-dev \
         libmariadbclient-dev 
 
-RUN git clone -b v1.0.0 --depth 1 https://github.com/tango-controls-hdbpp/libhdbpp.git
+# RUN echo "********************  TESTING  *********************"
+# RUN ls
+# RUN cd /usr/local/include \
+#   && ls
+# RUN cd /usr/local/lib \
+#   && ls
+
+RUN git clone -b v2.0.0 --depth 1 https://github.com/tango-controls-hdbpp/libhdbpp.git
 
 RUN cd libhdbpp \
  && mkdir build \
@@ -52,12 +59,12 @@ RUN cd libhdbpp/build \
     --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
     make install
 
-RUN git clone -b v1.1.0 --depth 1 https://github.com/tango-controls-hdbpp/libhdbpp-mysql.git
+RUN git clone -b v1.2.0 --depth 1 https://github.com/tango-controls-hdbpp/libhdbpp-mysql.git
 
 RUN cd libhdbpp-mysql \
  && make TANGO_INC=/usr/local/include/tango
 
-RUN cd libhdbpp-mysql \
+RUN cd libhdbpp-mysql/build \
  && checkinstall \
     --install=yes \
     --fstrans=no \
@@ -72,13 +79,13 @@ RUN cd libhdbpp-mysql \
     --stripso \
     --maintainer="tango" \
     --pkgarch=$(dpkg --print-architecture) \
-    --pkgversion="1.1.0" \
+    --pkgversion="1.2.0" \
     --pkgrelease="SNAPSHOT" \
     --pkgname="libhdbpp-mysql" \
     --requires="libmariadbclient-dev" \
     make install
 
-RUN git clone -b v1.0.1 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-es.git
+RUN git clone -b v2.0.0 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-es.git
 
 RUN cd hdbpp-es \
  && make TANGO_INC=/usr/local/include/tango
@@ -98,13 +105,13 @@ RUN cd hdbpp-es \
     --stripso \
     --maintainer="tango" \
     --pkgarch=$(dpkg --print-architecture) \
-    --pkgversion="1.0.1" \
+    --pkgversion="2.0.0" \
     --pkgrelease="SNAPSHOT" \
     --pkgname="hdbpp-es" \
     --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
     make install
 
-RUN git clone -b v1.0.0 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-cm.git
+RUN git clone -b v2.0.0 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-cm.git
 
 RUN cd hdbpp-cm \
  && make TANGO_INC=/usr/local/include/tango
@@ -124,7 +131,7 @@ RUN cd hdbpp-cm \
     --stripso \
     --maintainer="tango" \
     --pkgarch=$(dpkg --print-architecture) \
-    --pkgversion="1.0.0" \
+    --pkgversion="2.0.0" \
     --pkgrelease="SNAPSHOT" \
     --pkgname="hdbpp-cm" \
     --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
@@ -137,9 +144,9 @@ RUN apt-get update && \
     apt-get clean
 
 RUN dpkg -i /libhdbpp/build/libhdbpp_1.0.0-SNAPSHOT_amd64.deb
-RUN dpkg -i /libhdbpp-mysql/libhdbpp-mysql_1.1.0-SNAPSHOT_amd64.deb
-RUN dpkg -i /hdbpp-es/hdbpp-es_1.0.1-SNAPSHOT_amd64.deb
-RUN dpkg -i /hdbpp-cm/hdbpp-cm_1.0.0-SNAPSHOT_amd64.deb
+RUN dpkg -i /libhdbpp-mysql/libhdbpp-mysql_1.2.0-SNAPSHOT_amd64.deb
+RUN dpkg -i /hdbpp-es/hdbpp-es_2.0.0-SNAPSHOT_amd64.deb
+RUN dpkg -i /hdbpp-cm/hdbpp-cm_2.0.0-SNAPSHOT_amd64.deb
 
 RUN ldconfig