diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c366eae..74271714 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,14 +41,8 @@ cppcheck:
 
 build-debug-gcc-cpp11-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh gcc cpp11 debug"
+  script: "CI/ci-linux-build.sh gcc cpp11 debug qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "gcc"
-    LANGUAGE: "cpp11"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "debug"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
@@ -64,18 +58,12 @@ build-debug-gcc-cpp11-qt5.15.1:
 
 test-debug-gcc-cpp11-qt5.15.1:
   stage: test
-  script: "CI/ci-linux-test.sh gcc cpp11 debug"
+  script: "CI/ci-linux-test.sh gcc cpp11 debug qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "gcc"
-    LANGUAGE: "cpp11"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "debug"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-debug-gcc-cpp11-qt5.15.1]
   needs: [build-debug-gcc-cpp11-qt5.15.1]
   artifacts:
@@ -95,14 +83,8 @@ test-debug-gcc-cpp11-qt5.15.1:
 
 build-release-gcc-cpp11-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh gcc cpp11 release"
+  script: "CI/ci-linux-build.sh gcc cpp11 release qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "gcc"
-    LANGUAGE: "cpp11"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "release"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
@@ -118,18 +100,12 @@ build-release-gcc-cpp11-qt5.15.1:
 
 test-release-gcc-cpp11-qt5.15.1:
   stage: test
-  script: "CI/ci-linux-test.sh gcc cpp11 release"
+  script: "CI/ci-linux-test.sh gcc cpp11 release qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "gcc"
-    LANGUAGE: "cpp11"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "release"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-release-gcc-cpp11-qt5.15.1]
   needs: [build-release-gcc-cpp11-qt5.15.1]
   artifacts:
@@ -149,14 +125,8 @@ test-release-gcc-cpp11-qt5.15.1:
 
 build-debug-clang-cpp11-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh clang cpp11 debug"
+  script: "CI/ci-linux-build.sh clang cpp11 debug qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "clang"
-    LANGUAGE: "cpp11"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "debug"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
@@ -172,18 +142,12 @@ build-debug-clang-cpp11-qt5.15.1:
 
 test-debug-clang-cpp11-qt5.15.1:
   stage: test
-  script: "CI/ci-linux-test.sh clang cpp11 debug"
+  script: "CI/ci-linux-test.sh clang cpp11 debug qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "clang"
-    LANGUAGE: "cpp11"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "debug"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-debug-clang-cpp11-qt5.15.1]
   needs: [build-debug-clang-cpp11-qt5.15.1]
   artifacts:
@@ -203,14 +167,8 @@ test-debug-clang-cpp11-qt5.15.1:
 
 build-release-clang-cpp11-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh clang cpp11 release"
+  script: "CI/ci-linux-build.sh clang cpp11 release qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "clang"
-    LANGUAGE: "cpp11"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "release"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
@@ -226,18 +184,12 @@ build-release-clang-cpp11-qt5.15.1:
 
 test-release-clang-cpp11-qt5.15.1:
   stage: test
-  script: "CI/ci-linux-test.sh clang cpp11 release"
+  script: "CI/ci-linux-test.sh clang cpp11 release qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "clang"
-    LANGUAGE: "cpp11"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "release"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-release-clang-cpp11-qt5.15.1]
   needs: [build-release-clang-cpp11-qt5.15.1]
   artifacts:
@@ -257,14 +209,8 @@ test-release-clang-cpp11-qt5.15.1:
 
 build-debug-gcc-cpp14-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh gcc cpp14 debug"
+  script: "CI/ci-linux-build.sh gcc cpp14 debug qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "gcc"
-    LANGUAGE: "cpp14"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "debug"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
@@ -280,18 +226,12 @@ build-debug-gcc-cpp14-qt5.15.1:
 
 test-debug-gcc-cpp14-qt5.15.1:
   stage: test
-  script: "CI/ci-linux-test.sh gcc cpp14 debug"
+  script: "CI/ci-linux-test.sh gcc cpp14 debug qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "gcc"
-    LANGUAGE: "cpp14"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "debug"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-debug-gcc-cpp14-qt5.15.1]
   needs: [build-debug-gcc-cpp14-qt5.15.1]
   artifacts:
@@ -311,14 +251,8 @@ test-debug-gcc-cpp14-qt5.15.1:
 
 build-release-gcc-cpp14-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh gcc cpp14 release"
+  script: "CI/ci-linux-build.sh gcc cpp14 release qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "gcc"
-    LANGUAGE: "cpp14"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "release"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
@@ -334,18 +268,12 @@ build-release-gcc-cpp14-qt5.15.1:
 
 test-release-gcc-cpp14-qt5.15.1:
   stage: test
-  script: "CI/ci-linux-test.sh gcc cpp14 release"
+  script: "CI/ci-linux-test.sh gcc cpp14 release qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "gcc"
-    LANGUAGE: "cpp14"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "release"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-release-gcc-cpp14-qt5.15.1]
   needs: [build-release-gcc-cpp14-qt5.15.1]
   artifacts:
@@ -365,14 +293,8 @@ test-release-gcc-cpp14-qt5.15.1:
 
 build-debug-clang-cpp14-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh clang cpp14 debug"
+  script: "CI/ci-linux-build.sh clang cpp14 debug qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "clang"
-    LANGUAGE: "cpp14"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "debug"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
@@ -388,18 +310,12 @@ build-debug-clang-cpp14-qt5.15.1:
 
 test-debug-clang-cpp14-qt5.15.1:
   stage: test
-  script: "CI/ci-linux-test.sh clang cpp14 debug"
+  script: "CI/ci-linux-test.sh clang cpp14 debug qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "clang"
-    LANGUAGE: "cpp14"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "debug"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-debug-clang-cpp14-qt5.15.1]
   needs: [build-debug-clang-cpp14-qt5.15.1]
   artifacts:
@@ -419,14 +335,8 @@ test-debug-clang-cpp14-qt5.15.1:
 
 build-release-clang-cpp14-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh clang cpp14 release"
+  script: "CI/ci-linux-build.sh clang cpp14 release qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "clang"
-    LANGUAGE: "cpp14"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "release"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
@@ -442,18 +352,12 @@ build-release-clang-cpp14-qt5.15.1:
 
 test-release-clang-cpp14-qt5.15.1:
   stage: test
-  script: "CI/ci-linux-test.sh clang cpp14 release"
+  script: "CI/ci-linux-test.sh clang cpp14 release qt5.15.1"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "clang"
-    LANGUAGE: "cpp14"
-    QTVERSION: "qt5.15.1"
-    BUILDTYPE: "release"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-release-clang-cpp14-qt5.15.1]
   needs: [build-release-clang-cpp14-qt5.15.1]
   artifacts:
@@ -471,15 +375,17 @@ test-release-clang-cpp14-qt5.15.1:
 # Compiler:   clang
 # Language:   cpp14
 
-iwyu-release-clang-cpp14:
+iwyu-release-clang-cpp14-qt5.15.1:
   stage: build
-  script: "CI/ci-linux-build.sh clang cpp14 release IWYU"
+  script: "CI/ci-linux-build.sh clang cpp14 release qt5.15.1 IWYU"
   image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  tags: [Docker]
+  tags:
+    - Linux
+    - stretch
   artifacts:
     paths:
-    - build-clang-cpp14-release-iwyu-Vector-Checks/compile_commands.json
-    - build-clang-cpp14-release-iwyu-Vector-Checks/iwyu.dump
+    - build-clang-cpp14-release-qt5.15.1-iwyu-Vector-Checks/compile_commands.json
+    - build-clang-cpp14-release-qt5.15.1-iwyu-Vector-Checks/iwyu.dump
 
 # -----------------
 # MAC tasks
diff --git a/CI/ci-linux-prepare.sh b/CI/ci-linux-prepare.sh
index e66cf5f9..161c1c47 100755
--- a/CI/ci-linux-prepare.sh
+++ b/CI/ci-linux-prepare.sh
@@ -3,7 +3,8 @@
 COMPILER=$1
 LANGUAGE=$2
 BUILD_TYPE=$3
-IWYU=$4
+QTVERSION=$4
+IWYU=$5
 
 # Exit script on any error
 set -e 
@@ -90,3 +91,5 @@ if [ "$IWYU" == "IWYU" ]; then
   BUILDPATH="$BUILDPATH-iwyu"
   OPTIONS="$OPTIONS -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
 fi
+
+echo "Building to directory $BUILDPATH"
diff --git a/CI/gitlab-ci/linux-iwyu-job.yml b/CI/gitlab-ci/linux-iwyu-job.yml
index 0e5838aa..c2c88ddc 100644
--- a/CI/gitlab-ci/linux-iwyu-job.yml
+++ b/CI/gitlab-ci/linux-iwyu-job.yml
@@ -4,12 +4,14 @@
 # Compiler:   {{COMPILER}}
 # Language:   {{LANGUAGE}}
 
-iwyu-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}:
+iwyu-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}:
   stage: build
-  script: "CI/ci-linux-build.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}} IWYU"
+  script: "CI/ci-linux-build.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}} {{QT_VERSION}} IWYU"
   image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  tags: [Docker]
+  tags:
+    - Linux
+    - stretch
   artifacts:
     paths:
-    - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-iwyu-Vector-Checks/compile_commands.json
-    - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-iwyu-Vector-Checks/iwyu.dump
+    - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-Vector-Checks/compile_commands.json
+    - build-{{COMPILER}}-{{LANGUAGE}}-{{BUILDTYPE}}-{{QT_VERSION}}-iwyu-Vector-Checks/iwyu.dump
diff --git a/CI/gitlab-ci/linux-template-build-job.yml b/CI/gitlab-ci/linux-template-build-job.yml
index 82889e41..7709c095 100644
--- a/CI/gitlab-ci/linux-template-build-job.yml
+++ b/CI/gitlab-ci/linux-template-build-job.yml
@@ -7,14 +7,8 @@
 
 build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}:
   stage: build
-  script: "CI/ci-linux-build.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}}"
+  script: "CI/ci-linux-build.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}} {{QT_VERSION}}"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
-  variables:
-    COMPILER: "{{COMPILER}}"
-    LANGUAGE: "{{LANGUAGE}}"
-    QTVERSION: "{{QT_VERSION}}"
-    BUILDTYPE: "{{BUILDTYPE}}"
-    GIT_SUBMODULE_STRATEGY: recursive
   tags:
     - Linux
     - stretch
diff --git a/CI/gitlab-ci/linux-template-test-job.yml b/CI/gitlab-ci/linux-template-test-job.yml
index 10c5eddf..b9723cdf 100644
--- a/CI/gitlab-ci/linux-template-test-job.yml
+++ b/CI/gitlab-ci/linux-template-test-job.yml
@@ -6,18 +6,12 @@
 
 test-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}:
   stage: test
-  script: "CI/ci-linux-test.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}}"
+  script: "CI/ci-linux-test.sh {{COMPILER}} {{LANGUAGE}} {{BUILDTYPE}} {{QT_VERSION}}"
   #image: graphics.rwth-aachen.de:4567/docker/docker/docker-openmesh-container
   tags:
     - Linux
     - stretch
     - MultiThreads
-  variables:
-    COMPILER: "{{COMPILER}}"
-    LANGUAGE: "{{LANGUAGE}}"
-    QTVERSION: "{{QT_VERSION}}"
-    BUILDTYPE: "{{BUILDTYPE}}"
-    GIT_SUBMODULE_STRATEGY: recursive
   dependencies: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}]
   needs: [build-{{BUILDTYPE}}-{{COMPILER}}-{{LANGUAGE}}-{{QT_VERSION}}]
   artifacts: