diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05e0d45428a39cce21aab87aefd63f4cb0c6945b..dda1f529d8d18ade3884d5050af69244706d6935 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ prepare_ci_base_docker_image:
   stage: prepare-base
   script:
     - docker build -t ci_base:$CI_COMMIT_SHORT_SHA -f  Docker/lofar-ci/Dockerfile_ci_base .
+  interruptible: true
 
 #
 # PREPARE STAGE
@@ -28,16 +29,19 @@ prepare_ci_sas_docker_image:
   stage: prepare
   script:
     - docker build --build-arg BASE_VERSION=$CI_COMMIT_SHORT_SHA -t ci_sas:$CI_COMMIT_SHORT_SHA -f  Docker/lofar-ci/Dockerfile_ci_sas .
+  interruptible: true
 
 prepare_ci_lta_docker_image:
   stage: prepare
   script:
     - docker build --build-arg BASE_VERSION=$CI_COMMIT_SHORT_SHA -t ci_lta:$CI_COMMIT_SHORT_SHA -f  Docker/lofar-ci/Dockerfile_ci_lta .
+  interruptible: true
 
 prepare_ci_mac_docker_image:
   stage: prepare
   script:
     - docker build --build-arg BASE_VERSION=$CI_COMMIT_SHORT_SHA -t ci_mac:$CI_COMMIT_SHORT_SHA -f  Docker/lofar-ci/Dockerfile_ci_mac .
+  interruptible: true
 
 #
 # BUILD STAGE
@@ -52,8 +56,9 @@ build_TMSS:
     - mkdir -p build/gnucxx11_opt
     - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false ../..
-    - make -j 12
+    - make -j $(nproc)
     - make install
+  interruptible: true
   needs:
     - prepare_ci_sas_docker_image
   artifacts:
@@ -70,8 +75,9 @@ build_RAServices:
     - mkdir -p build/gnucxx11_opt
     - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=$PACKAGE -DCASACORE_ROOT_DIR=/opt/casacore/ -DCASAREST_ROOT_DIR=/opt/casarest/ -DUSE_LOG4CPLUS=false ../..
-    - make -j 12
+    - make -j $(nproc)
     - make install
+  interruptible: true
   needs:
     - prepare_ci_sas_docker_image
   artifacts:
@@ -88,8 +94,9 @@ build_LTAIngest:
     - mkdir -p build/gnucxx11_opt
     - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=$PACKAGE -DUSE_LOG4CPLUS=false ../..
-    - make -j 12
+    - make -j $(nproc)
     - make install
+  interruptible: true
   needs:
     - prepare_ci_lta_docker_image
   artifacts:
@@ -106,12 +113,12 @@ build_MCU_MAC:
     - mkdir -p build/gnucxx11_opt
     - cd build/gnucxx11_opt
     - cmake -DBUILD_PACKAGES=$PACKAGE -DWINCC_ROOT_DIR=/opt/WinCC_OA/3.16/ -DBLITZ_ROOT_DIR=/opt/blitz/ -DCASACORE_ROOT_DIR=/opt/casacore/ -DCMAKE_INSTALL_PREFIX=/opt/lofar ../..
-    - make -j 12
+    - make -j $(nproc)
     - make DESTDIR=${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install install
     - cd ${CI_BUILDS_DIR}/${CI_COMMIT_SHORT_SHA}/install/opt/lofar
     - tar --ignore-failed-read --exclude=include --exclude="*.ztar" -czf MCU_MAC_${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}.ztar *
     - curl --insecure --upload-file MCU_MAC_${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}.ztar -u upload:upload https://support.astron.nl/nexus/content/repositories/branches/nl/astron/lofar/${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}/MCU_MAC_${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}.x86_64.ztar
-
+  interruptible: true
   needs:
     - prepare_ci_mac_docker_image
   artifacts:
@@ -131,6 +138,7 @@ unit_test_TMSS:
     - echo "Testing $PACKAGE..."
     - cd build/gnucxx11_opt
     - SKIP_INTEGRATION_TESTS=true ctest
+  interruptible: true
   needs:
     - build_TMSS
   services:
@@ -155,6 +163,7 @@ unit_test_RAServices:
     - echo "Testing $PACKAGE..."
     - cd build/gnucxx11_opt
     - SKIP_INTEGRATION_TESTS=true ctest
+  interruptible: true
   services:
     - rabbitmq:latest
   variables:
@@ -179,6 +188,7 @@ unit_test_LTAIngest:
     - echo "Testing $PACKAGE..."
     - cd build/gnucxx11_opt
     - SKIP_INTEGRATION_TESTS=true ctest
+  interruptible: true
   services:
     - rabbitmq:latest
   variables:
@@ -204,6 +214,7 @@ unit_test_MCU_MAC:
     - echo "Testing $PACKAGE..."
     - cd build/gnucxx11_opt
     - SKIP_INTEGRATION_TESTS=true ctest
+  interruptible: true
   services:
     - rabbitmq:latest
   variables:
@@ -241,6 +252,7 @@ dockerize_TMSS:
     - docker tag tmss_testprovider:$CI_COMMIT_SHORT_SHA nexus.cep4.control.lofar:18080/tmss_testprovider:$CI_COMMIT_SHORT_SHA
     - docker push nexus.cep4.control.lofar:18080/tmss_testprovider:$CI_COMMIT_SHORT_SHA
     - docker logout $CI_NEXUS_REGISTRY
+  interruptible: true
   needs:
     - job: build_TMSS
       artifacts: true     
@@ -259,6 +271,7 @@ integration_test_TMSS:
     - echo "Integration Testing $PACKAGE..."
     - cd build/gnucxx11_opt
     - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest
+  interruptible: true
   services:
     - rabbitmq:latest
   variables:
@@ -290,6 +303,7 @@ integration_test_RAServices:
     - echo "Integration Testing $PACKAGE..."
     - cd build/gnucxx11_opt
     - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest
+  interruptible: true
   needs:
     - build_RAServices
     - unit_test_RAServices
@@ -309,6 +323,7 @@ integration_test_LTAIngest:
     - echo "Integration Testing $PACKAGE..."
     - cd build/gnucxx11_opt
     - SKIP_INTEGRATION_TESTS=false SKIP_UNIT_TESTS=true ctest
+  interruptible: true
   services:
     - rabbitmq:latest
   variables:
@@ -326,7 +341,6 @@ integration_test_LTAIngest:
   rules:
     - if: '$FASTLANE == "false"'
 
-
 #
 # DEPLOY STAGE
 #