diff --git a/dockerfiles/bionic.docker b/dockerfiles/bionic.docker
index ec339ae604508b2f4cf79e557decc11352cf763f..41592bc1ac8f7fa5bf456f06debf7f189460e239 100644
--- a/dockerfiles/bionic.docker
+++ b/dockerfiles/bionic.docker
@@ -37,3 +37,5 @@ RUN apt-get update && \
 ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
 ADD valgrind.suppressions /common/valgrind.suppressions
 
+# Start rpcbind at launch of the container, required for DOOCS
+ENTRYPOINT ["bash", "-c", "rpcbind -f -w ; bash"]
diff --git a/dockerfiles/tumbleweed.docker b/dockerfiles/tumbleweed.docker
index fe4a9409907787dd160c994e24aec038c1a4e64c..2691230c6ff58ae83ff6f7f0a87c5e6bd9a677ea 100644
--- a/dockerfiles/tumbleweed.docker
+++ b/dockerfiles/tumbleweed.docker
@@ -27,4 +27,6 @@ RUN zypper refresh && \
 ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
 ADD valgrind.suppressions /common/valgrind.suppressions
 ADD tumbleweed_proxy /etc/sysconfig/proxy
+
+# Start rpcbind at launch of the container, required for DOOCS
 ENTRYPOINT ["bash", "-c", "rpcbind -f -w ; bash"]
diff --git a/dockerfiles/xenial.docker b/dockerfiles/xenial.docker
index 3647759e87cf452de438a462348bd82bc6da8ad0..06b90ee96c95f8fd8aa1e4a65b70e18592759b17 100644
--- a/dockerfiles/xenial.docker
+++ b/dockerfiles/xenial.docker
@@ -4,35 +4,39 @@ ENV https_proxy http://xfelproxy.desy.de:3128
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
-   apt-get install -y software-properties-common apt-utils && \
-   add-apt-repository -y universe && \
-   add-apt-repository -y ppa:hola-launchpad/valgrind && \
-   apt-get update && \
-   apt-get upgrade -y && \
-   apt-get dist-upgrade -y && \
-   apt-get install -y sudo wget && \
-   apt-get install -y g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake && \
-   apt-get install -y libboost-all-dev libxml++2.6-dev && \
-   apt-get install -y libldap2-dev libzmq3-dev rpcbind && \
-   apt-get install -y libreadline-dev && \
-   apt-get install -y libqt4-dev qtbase5-dev && \
-   apt-get install -y python2.7-dev python-numpy python3-dev python3-numpy && \
-   apt-get install -y python-pytest && \
-   apt-get install -y libxmu6 csh libxrandr2 && \
-   apt-get install -y libncurses5-dev && \
-   apt-get install -y graphviz && \
-   apt-get install -y clang && \
-   apt-get install -y libhdf5-dev && \
-   apt-get install -y liblua5.2-dev && \
-   apt-get install -y python-sphinx && \
-   apt-get install -y libgsl-dev && \
-   apt-get install -y libssl-dev && \
-   apt-get install -y libpqxx-dev && \
-   apt-get install -y libfftw3-dev && \
-   apt-get install -y subversion && \
-   useradd -u 30996 msk_jenkins && \
-   ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3
-    
+    apt-get install -y software-properties-common apt-utils && \
+    add-apt-repository -y universe && \
+    add-apt-repository -y ppa:hola-launchpad/valgrind && \
+    apt-get update && \
+    apt-get upgrade -y && \
+    apt-get dist-upgrade -y && \
+    apt-get install -y sudo wget && \
+    apt-get install -y g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake && \
+    apt-get install -y libboost-all-dev libxml++2.6-dev && \
+    apt-get install -y libldap2-dev libzmq3-dev rpcbind && \
+    apt-get install -y libreadline-dev && \
+    apt-get install -y libqt4-dev qtbase5-dev && \
+    apt-get install -y python2.7-dev python-numpy python3-dev python3-numpy && \
+    apt-get install -y python-pytest && \
+    apt-get install -y libxmu6 csh libxrandr2 && \
+    apt-get install -y libncurses5-dev && \
+    apt-get install -y graphviz && \
+    apt-get install -y clang && \
+    apt-get install -y libhdf5-dev && \
+    apt-get install -y liblua5.2-dev && \
+    apt-get install -y python-sphinx && \
+    apt-get install -y libgsl-dev && \
+    apt-get install -y libssl-dev && \
+    apt-get install -y libpqxx-dev && \
+    apt-get install -y libfftw3-dev && \
+    apt-get install -y subversion && \
+    useradd -u 30996 msk_jenkins && \
+    ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3
+   
+# NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
+
 ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
 ADD valgrind.suppressions /common/valgrind.suppressions
 
+# Start rpcbind at launch of the container, required for DOOCS
+ENTRYPOINT ["bash", "-c", "rpcbind -f -w ; bash"]