diff --git a/.gitignore b/.gitignore
index 118fbad3d..19826eb2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -455,4 +455,4 @@ uwp-project/Assets/data
 uwp-project/Assets/fonts
 uwp-project/Assets/gendata
 uwp-project/Assets/ui_art
-
+!uwp-project/devilutionX_TemporaryKey.pfx
diff --git a/Packaging/xbox-one/build.bat b/Packaging/xbox-one/build.bat
index 41ef72729..7c074b947 100644
--- a/Packaging/xbox-one/build.bat
+++ b/Packaging/xbox-one/build.bat
@@ -15,6 +15,4 @@ powershell "Get-Content ..\uwp-project\Package.appxmanifest.template | %% {$_ -r
 
 msbuild /p:Configuration=Release;Platform=x64;AppxBundle=Always;AppxBundlePlatforms=x64 ..\uwp-project\devilutionx.sln
 
-powershell "Get-Childitem -Path uwp-project\AppxPackages, uwp-project\Release -Include Microsoft.VCLibs.x64.*.appx, devilutionX_*_x64.appx -File -Recurse | Copy-Item -Destination ..\Packaging\xbox-one"
-
-cd ..\Packaging\xbox-one
+powershell "Get-Childitem -Path uwp-project\AppxPackages, uwp-project\Release -Include Microsoft.VCLibs.x64.*.appx, devilutionX_*_x64.appx -File -Recurse | Compress-Archive -DestinationPath ..\devilutionx.zip"
diff --git a/appveyor-uwp.yml b/appveyor-uwp.yml
deleted file mode 100644
index eb9fcdd0f..000000000
--- a/appveyor-uwp.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: 1.0.{build}
-
-pull_requests:
-  do_not_increment_build_number: true
-image: Visual Studio 2022
-
-before_build:
-  - cd %APPVEYOR_BUILD_FOLDER%\Packaging\xbox-one
-
-build_script:
-  - build.bat
-artifacts:
-  - path: .
-    name: devilutionX_*_x64.appx
-  - path: .
-    name: Microsoft.VCLibs.x64.*.appx
diff --git a/appveyor.yml b/appveyor.yml
index fb270c216..162357107 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,21 +2,56 @@ version: 1.0.{build}
 
 pull_requests:
   do_not_increment_build_number: true
-image: Visual Studio 2022
-cache: '%LOCALAPPDATA%\vcpkg\archives'
-
-install:
-  - cd C:\Tools\vcpkg
-  - git pull
-  - .\bootstrap-vcpkg.bat
-  - cd %APPVEYOR_BUILD_FOLDER%
-
-before_build:
-  - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake .
-
-build:
-  project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln
-  verbosity: minimal
-artifacts:
-  - path: Debug\devilutionx.exe
-    name: devilutionx.exe
+environment:
+  matrix:
+
+  - job_name: windows
+    appveyor_build_worker_image: Visual Studio 2022
+
+  - job_name: uwp
+    appveyor_build_worker_image: Visual Studio 2022
+
+for:
+  -
+    matrix:
+      only:
+        - job_name: windows
+
+    cache: '%LOCALAPPDATA%\vcpkg\archives'
+
+    install:
+      - if not exist C:\Tools\vcpkg mkdir C:\Tools\vcpkg
+      - cd C:\Tools\vcpkg
+      - git pull
+      - .\bootstrap-vcpkg.bat
+      - cd %APPVEYOR_BUILD_FOLDER%
+
+    before_build:
+      - cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake .
+
+    build:
+      project: $(APPVEYOR_BUILD_FOLDER)\$(APPVEYOR_PROJECT_NAME).sln
+      verbosity: minimal
+
+    artifacts:
+      - path: Debug\devilutionx.exe
+        name: devilutionx.exe
+
+  -
+    matrix:
+      only:
+        - job_name: uwp
+
+    before_build:
+      - cd %APPVEYOR_BUILD_FOLDER%\Packaging\xbox-one
+      - if exist ..\..\build rd /s /q ..\..\build
+
+    build_script:
+      - build.bat
+
+    after_build:
+      - cd %APPVEYOR_BUILD_FOLDER%
+
+    artifacts:
+      - path: devilutionx.zip
+        name: devilutionx.zip
diff --git a/uwp-project/Package.appxmanifest.template b/uwp-project/Package.appxmanifest.template
index bed983668..761e49d72 100644
--- a/uwp-project/Package.appxmanifest.template
+++ b/uwp-project/Package.appxmanifest.template
@@ -9,7 +9,7 @@
   <Identity
     Name="b6830ff4-1ef5-4907-9d9e-1ba808edf70f"
     Publisher="CN=devilutionX"
-    Version="__PROJECT_VERSION__" />
+    Version="__PROJECT_VERSION__.0" />
 
   <mp:PhoneIdentity PhoneProductId="b6830ff4-1ef5-4907-9d9e-1ba808edf70f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/uwp-project/devilutionX_TemporaryKey.pfx b/uwp-project/devilutionX_TemporaryKey.pfx
new file mode 100644
index 000000000..9db4858e0
Binary files /dev/null and b/uwp-project/devilutionX_TemporaryKey.pfx differ