diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 072c9329..b4c7af9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -628,26 +628,6 @@ macos-cpp14-release:
 # VS Version:   VS2019
 # Apps:         {{APPS}}
 
-build-VS2019-x64-shared-TRUE-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2019"
-    ARCHITECTURE:   "x64"
-    SHARED:         "TRUE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2019
-    - Qt5150
-  artifacts:
-    paths:
-      - build-release/*.exe
-    reports:
-      junit:
-        - build-release/unittests/report.xml
-        - build-release/unittests/report-customvec.xml
-        - build-release/unittests/report-doublevec.xml
-
 build-VS2019-x64-shared-TRUE-no-apps:
   stage: build
   variables:
@@ -675,26 +655,6 @@ build-VS2019-x64-shared-TRUE-no-apps:
 # VS Version:   VS2019
 # Apps:         {{APPS}}
 
-build-VS2019-x64-shared-FALSE-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2019"
-    ARCHITECTURE:   "x64"
-    SHARED:         "FALSE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2019
-    - Qt5150
-  artifacts:
-    paths:
-      - build-release/*.exe
-    reports:
-      junit:
-        - build-release/unittests/report.xml
-        - build-release/unittests/report-customvec.xml
-        - build-release/unittests/report-doublevec.xml
-
 build-VS2019-x64-shared-FALSE-no-apps:
   stage: build
   variables:
@@ -723,26 +683,6 @@ build-VS2019-x64-shared-FALSE-no-apps:
 # VS Version:   VS2017
 # Apps:         {{APPS}}
 
-build-VS2017-x64-shared-TRUE-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2017"
-    ARCHITECTURE:   "x64"
-    SHARED:         "TRUE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2017
-    - Qt5101
-  artifacts:
-    paths:
-      - build-release/*.exe
-    reports:
-      junit:
-        - build-release/unittests/report.xml
-        - build-release/unittests/report-customvec.xml
-        - build-release/unittests/report-doublevec.xml
-
 build-VS2017-x64-shared-TRUE-no-apps:
   stage: build
   variables:
@@ -770,26 +710,6 @@ build-VS2017-x64-shared-TRUE-no-apps:
 # VS Version:   VS2017
 # Apps:         {{APPS}}
 
-build-VS2017-x64-shared-FALSE-apps:
-  stage: build
-  variables:
-    BUILD_PLATFORM: "VS2017"
-    ARCHITECTURE:   "x64"
-    SHARED:         "FALSE"
-    APPS:           "ON"
-  script: "CI\\Windows.bat"
-  tags:
-    - VS2017
-    - Qt5101
-  artifacts:
-    paths:
-      - build-release/*.exe
-    reports:
-      junit:
-        - build-release/unittests/report.xml
-        - build-release/unittests/report-customvec.xml
-        - build-release/unittests/report-doublevec.xml
-
 build-VS2017-x64-shared-FALSE-no-apps:
   stage: build
   variables:
diff --git a/CI/gitlab-ci/windows.yml b/CI/gitlab-ci/windows.yml
index b46c2ffa..2424a621 100644
--- a/CI/gitlab-ci/windows.yml
+++ b/CI/gitlab-ci/windows.yml
@@ -2,11 +2,11 @@
 # Windows tasks
 # -----------------
 
-{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150}
-{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150}
+{windows-template-job-noapps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150}
+{windows-template-job-noapps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150}
 
-{windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
-{windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}
+{windows-template-job-noapps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
+{windows-template-job-noapps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}
 
 {windows-template-job.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2015, QTTAG=Qt5101}
 {windows-template-job.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2015, QTTAG=Qt5101}