diff --git a/Docker/lofar-ci/Dockerfile_ci_base b/Docker/lofar-ci/Dockerfile_ci_base
index 1afd6427e70ff6bc4c5937f5986241e418751e0c..35016a984fb0dd38b48cef912ed12cfa5d1caec4 100644
--- a/Docker/lofar-ci/Dockerfile_ci_base
+++ b/Docker/lofar-ci/Dockerfile_ci_base
@@ -8,6 +8,7 @@ FROM centos:centos7.6.1810
 RUN yum -y groupinstall 'Development Tools' && \
     yum -y install epel-release && \
     yum -y install cmake cmake3 gcc git log4cplus-devel python3 python3-devel python3-pip which wget curl atop valgrind && \
+    python3 -m pip install -U pip && \
     pip3 install kombu==4.6.8 requests coverage python-qpid-proton && \
     adduser lofarsys && \
     mkdir -p /opt/lofar && chown -R lofarsys:lofarsys /opt
diff --git a/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh b/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh
index b8d3c9ed0d13e4d8c5e6ad000c180ea14e03747b..e8f313bb30a24e730c023ce7f826d13e6551fa11 100755
--- a/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh
+++ b/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh
@@ -35,7 +35,8 @@ rm -f /tmp/${FILENAME}
 
 cd /opt/lofar-versions/${RELEASE_NAME} || exit 1
 
-# Sym link installed var/ to common location.
+# Sym link installed var/ to common location. Some tarballs linger an empty var dir, so remove that first
+[ -d var ] && rmdir var
 ln -sfT /localdata/lofar-userdata/var var
 
 # Sym link installed etc/parset-additions.d/override to common location.
diff --git a/SAS/TMSS/backend/services/tmss_postgres_listener/bin/tmss_postgres_listener_service b/SAS/TMSS/backend/services/tmss_postgres_listener/bin/tmss_postgres_listener_service
old mode 100755
new mode 100644
diff --git a/SubSystems/SCU/CMakeLists.txt b/SubSystems/SCU/CMakeLists.txt
index 1e9b3e91c9d6d3d6baf805d600cd89d9b5e40e79..a40e3fca760202efa32c43603965210751182640 100644
--- a/SubSystems/SCU/CMakeLists.txt
+++ b/SubSystems/SCU/CMakeLists.txt
@@ -1,3 +1,40 @@
+IF(SKIP_TMSS_BUILD) # This is needed for building on Jenkins. When fully on GitLab it can be removed again.
+set(BUILD_TESTING OFF)
+lofar_package(SCU
+                DEPENDS MAC_Services
+                        MoMQueryService
+                        MoMutils
+                        OTDBtoRATaskStatusPropagator
+                        RATaskSpecifiedService
+                        RAtoOTDBTaskSpecificationPropagator
+                        ResourceAssigner
+                        ResourceAssignmentDatabase
+                        ResourceAssignmentEditor
+                        ResourceAssignmentEstimator
+                        ResourceAssignmentService
+                        SpecificationServices
+                        TBB
+                        TBBService
+                        TriggerServices
+                        TriggerEmailService
+                        TaskPrescheduler
+                        CleanupService
+                        AutoCleanupService
+                        StorageQueryService
+                        QPIDInfrastructure
+                        RAScripts
+                        StaticMetaData
+                        RACommon
+                        ltastorageoverview
+                        QA_Service
+                        MessageLogger
+                        TMSSClient
+                        TMSSSchedulingService
+                        TMSSFeedbackHandlingService
+                        TMSSPostgresListenerService
+                        TMSSWebSocketService
+                        TMSSWorkflowService)
+ELSE()
 lofar_package(SCU
                 DEPENDS MAC_Services
                         MoMQueryService
@@ -33,7 +70,8 @@ lofar_package(SCU
                         TMSSPostgresListenerService
                         TMSSWebSocketService
                         TMSSWorkflowService)
-
+ENDIF(SKIP_TMSS_BUILD)
+                      
 # supervisord config files
 lofar_add_sysconf_files(SCU.ini
                         DESTINATION supervisord.d)