diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f37301d..aa205bd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ build:windows:
         - git clean -xdf
         - git submodule sync --recursive
         - git submodule update --init --recursive
-        # Needs MSVC 2017 installed!
+        # Needs MSVC 2019 installed!
         # Setup vcvars32.bat manually because this is powershell and MS does not have something simmilar for PS. Wtf?
         # https://gist.github.com/justinian/81a2e55c89e8301a8a96
         # https://stackoverflow.com/questions/2124753/how-can-i-use-powershell-with-the-visual-studio-command-prompt
@@ -22,23 +22,16 @@ build:windows:
         - $Env:Path += ';C:\Qt\Tools\QtCreator\bin'
         - $env:path -split ";"
     script:
-        - .\install-dependencies.bat
-        - mkdir BUILD
-        - mkdir PACKAGE
-        - cd BUILD
-        - qmake.exe ../ScreenPlay.pro -spec win32-msvc "CONFIG+=release qtquickcompiler"
-        - jom.exe qmake_all 
-        - jom.exe  -j8
-        - jom.exe  install
-        - xcopy /s /y ScreenPlay\release ..\PACKAGE
-        - xcopy /s /y ScreenPlaySDK\release ..\PACKAGE
-        - xcopy /s /y ScreenPlayWidget\release ..\PACKAGE
-        - xcopy /s /y ScreenPlayWallpaper\release ..\PACKAGE
-        - cd ..
-        - windeployqt.exe  --release  --qmldir ScreenPlay/qml PACKAGE/ScreenPlay.exe
-        - windeployqt.exe  --release  --qmldir ScreenPlayWallpaper PACKAGE/ScreenPlayWallpaper.exe
-        - cd PACKAGE
-        - del *.cpp,*.moc,*.h,*.obj,*.res,*.exp,*.lib,*.lik,*.pch
+        - .\install_dependencies_windows.bat
+        - mkdir BUILD_WINDOWS
+        - cd BUILD_WINDOWS
+        - cmake.exe ../  -DCMAKE_PREFIX_PATH=c:/Qt/5.14.0/msvc2017 -DCMAKE_IGNORE_PATH=C:/Strawberry/c/bin -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="$(Get-Location)/../Common/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows "-GCodeBlocks - Ninja" -B.
+        - cmake.exe --build . --target all
+        - cd bin
+        - windeployqt.exe  --release  --qmldir ../../Client/qml Client.exe
+        - windeployqt.exe  --release   K3000Server.exe
+        - del *.cpp,*.moc,*.h,*.obj,*.res,*.exp,*.lib,*.lik,*.pch, *.ninja, *.exe.manifest, *.cbp, *.cmake, *.ninja_log, *.ninja_deps
+        - Remove-Item  CMakeFiles  -Recurse -Force
     artifacts:
         expire_in: '12 weeks'
         paths: