diff --git a/contrib/win-installer/build.ps1 b/contrib/win-installer/build.ps1
index 1c91cff889..42ba85fcde 100644
--- a/contrib/win-installer/build.ps1
+++ b/contrib/win-installer/build.ps1
@@ -105,7 +105,7 @@ if ($ENV:INSTVER -eq "") {
 }
 
 $installerPlatform = ""
-if ($null -eq $ENV:PODMAN_ARCH -or $ENV:PODMAN_ARCH -eq "amd64") {
+if ($null -eq $ENV:PODMAN_ARCH -or "" -eq $ENV:PODMAN_ARCH -or "amd64" -eq $ENV:PODMAN_ARCH) {
     $installerPlatform = "x64"
 } elseif ($ENV:PODMAN_ARCH -eq "arm64") {
     $installerPlatform = "arm64"
diff --git a/contrib/win-installer/process-release.ps1 b/contrib/win-installer/process-release.ps1
index 5392831632..aebaaa2dcd 100644
--- a/contrib/win-installer/process-release.ps1
+++ b/contrib/win-installer/process-release.ps1
@@ -97,10 +97,14 @@ try {
     $restore = 1
     $ProgressPreference = 'SilentlyContinue';
 
+    if ($null -eq $ENV:PODMAN_ARCH -or "" -eq $ENV:PODMAN_ARCH ) {
+        Write-Warning "PODMAN_ARCH not set, defaulting to amd64"
+        $ENV:PODMAN_ARCH = "amd64"
+    }
     if ($releaseDir.Length -gt 0) {
-        Copy-Item -Path "$releaseDir/podman-remote-release-windows_amd64.zip" "release.zip"
+        Copy-Item -Path "$releaseDir/podman-remote-release-windows_${ENV:PODMAN_ARCH}.zip" "release.zip"
     } else {
-        DownloadOrSkip "$base_url/releases/download/$version/podman-remote-release-windows_amd64.zip"  "release.zip"
+        DownloadOrSkip "$base_url/releases/download/$version/podman-remote-release-windows_${ENV:PODMAN_ARCH}.zip"  "release.zip"
         DownloadOptional "$base_url/releases/download/$version/shasums" ..\shasums
     }
     Expand-Archive -Path release.zip
diff --git a/winmake.ps1 b/winmake.ps1
index ad032168ed..3b8b94a59d 100644
--- a/winmake.ps1
+++ b/winmake.ps1
@@ -14,6 +14,7 @@ param (
             Write-Warning "Unsupported architecture $arch. Using default ($defaultArchitecture)."
             return $defaultArchitecture
         }
+        return $arch
     ),
     [parameter(ValueFromRemainingArguments)][object[]]$params = @()
 )
@@ -108,7 +109,7 @@ function Installer{
         [string]$version,
         [string]$suffix = "dev"
     );
-    Write-Host "Building the windows installer"
+    Write-Host "Building the windows installer for $architecture"
 
     # Check for the files to include in the installer
     $requiredArtifacts = @(