diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4c7af9b..dd8e0389 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -628,16 +628,17 @@ macos-cpp14-release:
 # VS Version:   VS2019
 # Apps:         {{APPS}}
 
-build-VS2019-x64-shared-TRUE-no-apps:
+build-VS2019-x64-shared-TRUE-apps:
   stage: build
   variables:
     BUILD_PLATFORM: "VS2019"
     ARCHITECTURE:   "x64"
     SHARED:         "TRUE"
-    APPS:           "OFF"
+    APPS:           "ON"
   script: "CI\\Windows.bat"
   tags:
     - VS2019
+    - Qt5150
   artifacts:
     paths:
       - build-release/*.exe
@@ -655,16 +656,17 @@ build-VS2019-x64-shared-TRUE-no-apps:
 # VS Version:   VS2019
 # Apps:         {{APPS}}
 
-build-VS2019-x64-shared-FALSE-no-apps:
+build-VS2019-x64-shared-FALSE-apps:
   stage: build
   variables:
     BUILD_PLATFORM: "VS2019"
     ARCHITECTURE:   "x64"
     SHARED:         "FALSE"
-    APPS:           "OFF"
+    APPS:           "ON"
   script: "CI\\Windows.bat"
   tags:
     - VS2019
+    - Qt5150
   artifacts:
     paths:
       - build-release/*.exe
@@ -683,16 +685,17 @@ build-VS2019-x64-shared-FALSE-no-apps:
 # VS Version:   VS2017
 # Apps:         {{APPS}}
 
-build-VS2017-x64-shared-TRUE-no-apps:
+build-VS2017-x64-shared-TRUE-apps:
   stage: build
   variables:
     BUILD_PLATFORM: "VS2017"
     ARCHITECTURE:   "x64"
     SHARED:         "TRUE"
-    APPS:           "OFF"
+    APPS:           "ON"
   script: "CI\\Windows.bat"
   tags:
     - VS2017
+    - Qt5101
   artifacts:
     paths:
       - build-release/*.exe
@@ -710,16 +713,17 @@ build-VS2017-x64-shared-TRUE-no-apps:
 # VS Version:   VS2017
 # Apps:         {{APPS}}
 
-build-VS2017-x64-shared-FALSE-no-apps:
+build-VS2017-x64-shared-FALSE-apps:
   stage: build
   variables:
     BUILD_PLATFORM: "VS2017"
     ARCHITECTURE:   "x64"
     SHARED:         "FALSE"
-    APPS:           "OFF"
+    APPS:           "ON"
   script: "CI\\Windows.bat"
   tags:
     - VS2017
+    - Qt5101
   artifacts:
     paths:
       - build-release/*.exe
diff --git a/CI/gitlab-ci/windows.yml b/CI/gitlab-ci/windows.yml
index 2424a621..01a994dc 100644
--- a/CI/gitlab-ci/windows.yml
+++ b/CI/gitlab-ci/windows.yml
@@ -2,11 +2,11 @@
 # Windows tasks
 # -----------------
 
-{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-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150}
+{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150}
 
-{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-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101}
+{windows-template-job-apps.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}