diff --git a/ddf2/Dockerfile b/ddf2/Dockerfile
index c5eea559cbf509672a70eca026872ec8c1106336..8d2666d10a8756791f6dd7662a2ba4654cba0a08 100644
--- a/ddf2/Dockerfile
+++ b/ddf2/Dockerfile
@@ -1,4 +1,6 @@
-FROM lofar/lofar-pipeline:LOFAR-Release-4_0_16
+FROM lofarit/base4.0.16
+
+USER root
 
 # Package dependencies
 COPY apt.sources.list /etc/apt/sources.list
@@ -165,5 +167,12 @@ RUN sed -e "s|INSTALLDIR|/opt|" /opt/ddf-pipeline/misc/DDF.sh > /opt/DDFacet/ini
 
 RUN cd /opt && git clone https://www.ict.inaf.it/gitlab/lofarit/container-data.git
 
+
+#####################################################################
+# Switch back to lofar user and set env
+#####################################################################
+
+USER lofar
+
 ENV DDF_PIPELINE_CATALOGS='/opt/container-data/bootstrap-cats/'
 ENV CONTAINER_NAME='ddfacet_ssd-py3_kms-lofar-release-4_0_16'