diff --git a/gitlab-ci/Dockerfile b/gitlab-ci/Dockerfile
index b1111f202320205f06be6c44dc8f7ec2a3027785..ebc2b0f64121b0baba031097ac2f1067da618a89 100644
--- a/gitlab-ci/Dockerfile
+++ b/gitlab-ci/Dockerfile
@@ -25,9 +25,6 @@ RUN apt-get update; \
 RUN apt-file update;
 RUN git clone https://github.com/ExLibrisGroup/Rosetta.dps-sdk-projects.git
 RUN ln -s ${EXLIBRIS_REPODIR} ${EXLIBRIS_PATH}
-RUN echo TCPSocket 3310 >> /etc/clamav/clamd.conf
-RUN echo TCPAddr 127.0.0.1 >> /etc/clamav/clamd.conf
+RUN echo TCPSocket 3310 >> /etc/clamav/clamd.conf ; echo TCPAddr 127.0.0.1 >> /etc/clamav/clamd.conf
 RUN /usr/bin/freshclam
-USER clamav
-RUN mkdir -p /var/run/clamav
-USER root
+RUN mkdir -p /var/run/clamav && chown -R clamav.clamav /var/run/clamav