diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
index f05a71b89a5..63cb7281388 100644
--- a/.github/actions/publish/action.yml
+++ b/.github/actions/publish/action.yml
@@ -134,7 +134,8 @@ runs:
           BUILD_ARCH='x64,arm64'
 
         elif [[ $runner_os =~ windows|win ]]; then
-          BUILD_ARCH="ia32,x64"
+          #BUILD_ARCH="ia32,x64"
+          BUILD_ARCH="x64"
 
         else
           echo "ERROR: unexpected runner OS: ${runner_os}"
@@ -164,6 +165,10 @@ runs:
       with:
         name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}
         path: |
-          out/**/*.{deb,rpm,dmg,zip}
-          out/**/*Setup.exe
+          out/make/**/*.zip
+          out/make/**/*.dmg
+          out/make/**/*.rpm
+          out/make/**/*.deb
+          out/make/**/*Setup.exe
         retention-days: 1
+        if-no-files-found: error
diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index 1193e1f7fd0..90ff0b80324 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -20,7 +20,7 @@ jobs:
       (github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request_target')
     secrets: inherit
     with:
-      tests_run_on: '["ubuntu-20.04","macos-12","windows-2019"]'
+      tests_run_on: '["ubuntu-20.04","macos-12","windows-2022"]'
       restrict_custom_actions: false
       github_prerelease: true
       repo_config: true
diff --git a/forge.config.ts b/forge.config.ts
index 2c1cc0df8bb..7b8a76e4aba 100644
--- a/forge.config.ts
+++ b/forge.config.ts
@@ -58,7 +58,7 @@ const config: ForgeConfig = {
   },
   rebuildConfig: {},
   makers: [
-    new MakerZIP(),
+    new MakerZIP({}, ['darwin']),
     new MakerSquirrel({
       setupIcon: 'assets/icon.ico',
       ...winSigningConfig,
@@ -94,7 +94,7 @@ const config: ForgeConfig = {
     }),
     new MakerRpm({
       options: {
-        icon: './assets/iconset',
+        icon: './assets/icon.png',
         categories: ['Utility'],
         productDescription: LONG_DESCRIPTION,
         requires: [
@@ -104,7 +104,7 @@ const config: ForgeConfig = {
     }),
     new MakerDeb({
       options: {
-        icon: './assets/iconset',
+        icon: './assets/icon.png',
         categories: ['Utility'],
         section: 'utils',
         priority: 'optional',