diff --git a/LCU/Maintenance/Docker/BackgroundWorkers/Dockerfile b/LCU/Maintenance/Docker/BackgroundWorkers/Dockerfile
index a93bfbb1db132cb2e4cbf17d6460d56a9980cc96..2593ef3e4a138e647531bee57037db8582f4802b 100644
--- a/LCU/Maintenance/Docker/BackgroundWorkers/Dockerfile
+++ b/LCU/Maintenance/Docker/BackgroundWorkers/Dockerfile
@@ -1,4 +1,6 @@
-FROM lofar-maintenance-base
+ARG TAG=latest
+FROM lofar-maintenance-base:${TAG}
+
 COPY --from=lofar-maintenance-dbinterface /opt/lofar/ /opt/lofar
 
 COPY ./entrypoint.sh /root/
diff --git a/LCU/Maintenance/Docker/DBInterface/Dockerfile b/LCU/Maintenance/Docker/DBInterface/Dockerfile
index af28a0fbb3e7961bc4405b61ca862c877277fe19..fc29c9d6e083daafc887909560f763d719351d97 100644
--- a/LCU/Maintenance/Docker/DBInterface/Dockerfile
+++ b/LCU/Maintenance/Docker/DBInterface/Dockerfile
@@ -1,4 +1,5 @@
-FROM lofar-maintenance-base as lofar-maintenance-dbinterface
+ARG TAG=latest
+FROM lofar-maintenance-base:${TAG} as lofar-maintenance-dbinterface
 
 ARG SRC_DIR=/root/src
 ARG BUILD_DIR=$SRC_DIR/build/gnucxx11_debug
diff --git a/LCU/Maintenance/Docker/Jenkinsfile b/LCU/Maintenance/Docker/Jenkinsfile
index cd598ad55868a7e92c376fa88c300413634df91f..b122a566ab42a44036914122acdfa1850c89c7aa 100644
--- a/LCU/Maintenance/Docker/Jenkinsfile
+++ b/LCU/Maintenance/Docker/Jenkinsfile
@@ -6,8 +6,23 @@ pipeline {
                 label 'bob'
             }
             steps {
-                sh 'ls && pwd'
-                sh 'docker-compose -f LCU/Maintenance/Docker/compose_build.yml build'
+                source_dir = pwd()
+
+                chdir '${source_dir}/LCU/Maintenance/Docker/BaseMaintenance/'
+                sh 'docker build -t lofar-maintenance-base'
+
+                chdir '${source_dir}'
+                sh 'docker build -f LCU/Maintenance/Docker/DBInterface/Dockerfile -t lofar-maintenance-dbinterface'
+
+                chdir '${source_dir}/LCU/Maintenance/Docker/RESTService/'
+                sh 'docker build -t lofar-maintenance-restservice'
+
+                chdir '${source_dir}/LCU/Maintenance/Docker/RESTService/'
+
+                sh 'docker build -f LCU/Maintenance/Docker/compose_build.yml build lofar-maintenance-nginxproxy -t '
+
+                sh 'docker-compose -f LCU/Maintenance/Docker/compose_build.yml build lofar-maintenance-backgroundworkers -t '
+
             }
         }
         stage('Test') {
diff --git a/LCU/Maintenance/Docker/NginxProxy/Dockerfile b/LCU/Maintenance/Docker/NginxProxy/Dockerfile
index 03acbe8704df2d51e568c50f023ec89c6ea6e43d..efb5b5263b9ab541abc2c58460a49449561789c3 100644
--- a/LCU/Maintenance/Docker/NginxProxy/Dockerfile
+++ b/LCU/Maintenance/Docker/NginxProxy/Dockerfile
@@ -1,4 +1,5 @@
-FROM lofar-maintenance-restservice as django_staticfiles_source
+ARG TAG=latest
+FROM lofar-maintenance-restservice:${TAG} as django_staticfiles_source
 
 RUN source /opt/lofar/lofarinit.sh && \
     mkdir -p /opt/lofar/var/www && \
diff --git a/LCU/Maintenance/Docker/RESTService/Dockerfile b/LCU/Maintenance/Docker/RESTService/Dockerfile
index 0493748ac33a4049272eae40306f346f4a719a4b..8ae6559e80303478eb24988178ac9a9be3535280 100644
--- a/LCU/Maintenance/Docker/RESTService/Dockerfile
+++ b/LCU/Maintenance/Docker/RESTService/Dockerfile
@@ -1,4 +1,6 @@
-FROM lofar-maintenance-base
+ARG TAG=latest
+
+FROM lofar-maintenance-base:${TAG}
 COPY --from=lofar-maintenance-dbinterface /opt/lofar/ /opt/lofar
 
 RUN pip3.6 install gunicorn==19.9.0 \