diff --git a/Docker/lofar-outputproc/Dockerfile.tmpl b/Docker/lofar-outputproc/Dockerfile.tmpl
index 51bbc22455136301202e7e9bda967827ee598557..e0969b5d78a69578232c18fa9861bcb60ef4f9e5 100644
--- a/Docker/lofar-outputproc/Dockerfile.tmpl
+++ b/Docker/lofar-outputproc/Dockerfile.tmpl
@@ -6,6 +6,7 @@ FROM lofar-base:${LOFAR_TAG}
 RUN apt-get update && apt-get install -y git python python3 g++ make
 
 # Consume superfluous build variables
+ARG DOCKER_IMAGE_BUILD_DATE=now
 ENV DOCKER_IMAGE_BUILD_DATE=${DOCKER_IMAGE_BUILD_DATE}
 
 #
@@ -34,6 +35,8 @@ RUN aptitude install -y libhdf5-${LIBHDF5_VERSION} python3 && \
     aptitude clean && \
     aptitude autoclean
 
+ARG J=6
+
 RUN export BUILD_PACKAGES="git cmake g++ swig3.0 python3-setuptools python3-dev libhdf5-dev" && \
     aptitude install -y ${BUILD_PACKAGES} && \
     mkdir -p ${INSTALLDIR}/DAL/build && \
@@ -57,8 +60,11 @@ RUN export BUILD_PACKAGES="git cmake g++ swig3.0 python3-setuptools python3-dev
 RUN apt-get update && apt-get install -y binutils liblog4cplus-1.1-9 libxml2 libboost-thread${BOOST_VERSION}.1 libboost-filesystem${BOOST_VERSION}.1 libboost-date-time${BOOST_VERSION}.1 libpng16-16 libsigc++-2.0-dev libxml++2.6-2v5 libboost-regex${BOOST_VERSION}.1 libreadline${READLINE_VERSION}
 
 # Tell image build information
-ENV LOFAR_BRANCH=${LOFAR_VERSION} \
-    LOFAR_BUILDVARIANT=${LOFAR_BUILDVARIANT}
+ARG LOFAR_VERSION=master
+ENV LOFAR_BRANCH=${LOFAR_VERSION}
+
+ARG LOFAR_BUILDVARIANT=gnucxx11_opt
+ENV LOFAR_BUILDVARIANT=${LOFAR_BUILDVARIANT}
 
 # Install
 RUN apt-get update && apt-get install -y git cmake g++ gfortran bison flex autogen liblog4cplus-dev libhdf5-dev libboost-dev boost-python${BOOST_VERSION}-dev libxml2-dev pkg-config libpng-dev libfftw3-dev libunittest++-dev libxml++2.6-dev libboost-filesystem${BOOST_VERSION}-dev libboost-date-time${BOOST_VERSION}-dev libboost-thread${BOOST_VERSION}-dev libboost-regex${BOOST_VERSION}-dev binutils-dev libopenblas-dev libcfitsio-dev wcslib-dev libcap2-bin libreadline-dev && \