diff --git a/docker-compose/hdbpp/Dockerfile b/docker-compose/hdbpp/Dockerfile
index cdfbebb254674583ea3d6c0ae633f171e124f5fb..16fe7d772997d3911015d1816aa5be375c95573c 100644
--- a/docker-compose/hdbpp/Dockerfile
+++ b/docker-compose/hdbpp/Dockerfile
@@ -31,7 +31,7 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
 
 # ----------- LIBHDB++ -----------------------------
 
-RUN git clone -b master https://gitlab.com/tango-controls/hdbpp/libhdbpp.git
+RUN git clone https://gitlab.com/tango-controls/hdbpp/libhdbpp.git
 
 RUN cd libhdbpp \
  && mkdir build \
@@ -46,7 +46,7 @@ RUN cd libhdbpp/build \
     --showinstall=no \
     --backup=no \
     --type=debian \
-    --pkgsource="https://github.com/tango-controls-hdbpp/libhdbpp" \
+    --pkgsource="https://gitlab.com/tango-controls/hdbpp/libhdbpp" \
     --pkglicense="LGPLv3" \
     --deldesc=no \
     --nodoc \
diff --git a/docker-compose/hdbppts-cm/Dockerfile b/docker-compose/hdbppts-cm/Dockerfile
index c6c5c92105c75b36b5aefb57e89c1a8c00e457f7..71afb54d57d0c560c902e5b9ec588d8bb9463c56 100644
--- a/docker-compose/hdbppts-cm/Dockerfile
+++ b/docker-compose/hdbppts-cm/Dockerfile
@@ -3,7 +3,7 @@ FROM ${SOURCE_IMAGE}
 
 # ----------- HDB++ CONFIGURATION MANAGER ---------------
 
-RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-cm.git
+RUN git clone https://gitlab.com/tango-controls/hdbpp/hdbpp-cm.git
 
 RUN cd hdbpp-cm \
  && mkdir -p build \
@@ -18,7 +18,7 @@ RUN cd hdbpp-cm/build \
     --showinstall=no \
     --backup=no \
     --type=debian \
-    --pkgsource="https://github.com/tango-controls-hdbpp/hdbpp-cm" \
+    --pkgsource="https://gitlab.com/tango-controls/hdbpp/hdbpp-cm" \
     --pkglicense="GPLv3" \
     --deldesc=no \
     --nodoc \
diff --git a/docker-compose/hdbppts-es/Dockerfile b/docker-compose/hdbppts-es/Dockerfile
index bd74e1b97e41a1d1ffa4be13891435e9abb6252a..231ecb3d7c4da3979628b54ef04848aab212cfd2 100644
--- a/docker-compose/hdbppts-es/Dockerfile
+++ b/docker-compose/hdbppts-es/Dockerfile
@@ -3,7 +3,7 @@ FROM ${SOURCE_IMAGE}
 
 # ----------- HDB++ EVENT SUBSCRIBER ---------------
 
-RUN git clone -b master https://github.com/tango-controls-hdbpp/hdbpp-es.git
+RUN git clone https://gitlab.com/tango-controls/hdbpp/hdbpp-es.git
 
 RUN cd hdbpp-es \
  && mkdir -p build \
@@ -18,7 +18,7 @@ RUN cd hdbpp-es/build \
     --showinstall=no \
     --backup=no \
     --type=debian \
-    --pkgsource="https://github.com/tango-controls-hdbpp/hdbpp-es" \
+    --pkgsource="https://gitlab.com/tango-controls/hdbpp/hdbpp-es" \
     --pkglicense="GPLv3" \
     --deldesc=no \
     --nodoc \