diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53051f7..8bd9cd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ stages:
   - test
   - deploy
 
-build_job:
+build_base:
   stage: build
   tags:
       - xamarin
@@ -55,6 +55,24 @@ build_job:
       - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi'  # saving msi to copy to deploy folder
       - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
 
+build_UWP:
+  stage: build
+  tags:
+      - xamarin
+      - windows
+#   only:
+#     - tags  # the build process will only be started by git tag commits
+  script:
+    - whoami
+    - '& "$env:NUGET_PATH" restore'  # restore Nuget dependencies
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /target:Borepin.UWP'  # build the project
+  artifacts:
+    expire_in: 1 week  # save gitlab server space, we copy the files we need to deploy folder later on
+    paths:
+      - '$env:EXE_RELEASE_FOLDER\Borepin.exe'  # saving exe to copy to deploy folder
+      - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi'  # saving msi to copy to deploy folder
+      - '$env:TEST_FOLDER\'  # saving entire Test project so NUnit can run tests
+
 test_job:
   stage: test
   tags: