diff --git a/Docker/lofar-base/chuser.sh b/Docker/lofar-base/chuser.sh
index 3c4e9d3ab0fa826b4dc5804f756e241958103004..76ba3ca7ecaede8f5eb9039c632795f94850273e 100755
--- a/Docker/lofar-base/chuser.sh
+++ b/Docker/lofar-base/chuser.sh
@@ -16,9 +16,6 @@ if [ -n "${LUSER}" ]; then
 
   # Set ownership of home dir to new user
   chown --from=${OLDID} -R ${LUSER}:${LGROUP} ${HOME}
-
-  # Set ownership of installed software to new user
-  chown --from=${OLDID} -R ${LUSER}:${LGROUP} /opt
 fi
 
 # Update environment for updated user
diff --git a/Docker/lofar-outputproc/Dockerfile.tmpl b/Docker/lofar-outputproc/Dockerfile.tmpl
index 85d511291228a25dc25715250e4fcc64e7699ce1..1a77d72d68bd1f504d9e96b0d003ff068c69843c 100644
--- a/Docker/lofar-outputproc/Dockerfile.tmpl
+++ b/Docker/lofar-outputproc/Dockerfile.tmpl
@@ -26,7 +26,8 @@ RUN sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y su
     cd ${INSTALLDIR}/lofar/build/gnu_opt && sed -i '29,31d' include/ApplCommon/PosixTime.h && \
     cd ${INSTALLDIR}/lofar/build/gnu_opt && make -j ${J} && \
     cd ${INSTALLDIR}/lofar/build/gnu_opt && make install && \
-    bash -c "mkdir -p ${INSTALLDIR}/lofar/var/{log,run}" && \
+    bash -c "mkdir -p /home/${USER}/lofar/var/{log,run}" && \
+    bash -c "ln -sfT ${INSTALLDIR}/lofar/var /home/${USER}/lofar/var" && \
     bash -c "strip ${INSTALLDIR}/lofar/{bin,sbin,lib64}/* || true" && \
     bash -c "rm -rf ${INSTALLDIR}/lofar/{build,src}" && \
     sudo setcap cap_sys_nice,cap_ipc_lock=ep ${INSTALLDIR}/lofar/bin/outputProc && \
diff --git a/Docker/lofar-pipeline/Dockerfile.tmpl b/Docker/lofar-pipeline/Dockerfile.tmpl
index 531b41e58e83a049b7008af4b109dcdfad514435..d2d27f09615265d2f79604b6fb2fd08d5522e39a 100644
--- a/Docker/lofar-pipeline/Dockerfile.tmpl
+++ b/Docker/lofar-pipeline/Dockerfile.tmpl
@@ -51,7 +51,8 @@ RUN sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y su
     cd ${INSTALLDIR}/lofar/build/gnu_opt && sed -i '29,31d' include/ApplCommon/PosixTime.h && \
     cd ${INSTALLDIR}/lofar/build/gnu_opt && make -j ${J} && \
     cd ${INSTALLDIR}/lofar/build/gnu_opt && make install && \
-    bash -c "mkdir -p ${INSTALLDIR}/lofar/var/{log,run}" && \
+    bash -c "mkdir -p /home/${USER}/lofar/var/{log,run}" && \
+    bash -c "ln -sfT ${INSTALLDIR}/lofar/var /home/${USER}/lofar/var" && \
     bash -c "strip ${INSTALLDIR}/lofar/{bin,sbin,lib64}/* || true" && \
     bash -c "rm -rf ${INSTALLDIR}/lofar/{build,src}" && \
     sudo apt-get purge -y subversion cmake g++ gfortran bison flex liblog4cplus-dev libhdf5-dev libblitz0-dev libboost-dev libboost-python-dev python-dev libxml2-dev pkg-config libpng12-dev libfftw3-dev libunittest++-dev libxml++2.6-dev libgsl0-dev libboost-filesystem${BOOST_VERSION}-dev libboost-date-time${BOOST_VERSION}-dev libboost-thread${BOOST_VERSION}-dev binutils-dev wcslib-dev && \