diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 49543328c..1d2c0874a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -184,7 +184,11 @@ stages:
       - bash: ./build.sh --packages
         displayName: Create Packages
       - bash: |
-          setup/inno/ISCC.exe setup/lidarr.iss //DFramework=netcoreapp3.1
+          setup/inno/ISCC.exe setup/lidarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x86
+          cp setup/output/Lidarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x86-installer.exe
+        displayName: Create .NET Core Windows installer
+      - bash: |
+          setup/inno/ISCC.exe setup/lidarr.iss //DFramework=netcoreapp3.1 //DRuntime=win-x64
           cp setup/output/Lidarr.*windows.netcoreapp3.1.exe ${BUILD_ARTIFACTSTAGINGDIRECTORY}/Lidarr.${BUILDNAME}.windows-core-x64-installer.exe
         displayName: Create .NET Core Windows installer
       - publish: $(Build.ArtifactStagingDirectory)
@@ -228,7 +232,14 @@ stages:
           archiveFile: '$(Build.ArtifactStagingDirectory)/Lidarr.$(buildName).windows-core-x64.zip'
           archiveType: 'zip'
           includeRootFolder: false
-          rootFolderOrFile: $(artifactsFolder)/windows/netcoreapp3.1
+          rootFolderOrFile: $(artifactsFolder)/win-x64/netcoreapp3.1
+      - task: ArchiveFiles@2
+        displayName: Create Windows x86 Core zip
+        inputs:
+          archiveFile: '$(Build.ArtifactStagingDirectory)/Lidarr.$(buildName).windows-core-x86.zip'
+          archiveType: 'zip'
+          includeRootFolder: false
+          rootFolderOrFile: $(artifactsFolder)/win-x86/netcoreapp3.1
       - task: ArchiveFiles@2
         displayName: Create MacOS Core app
         inputs:
diff --git a/build.sh b/build.sh
index 48e668b1f..9fba36736 100755
--- a/build.sh
+++ b/build.sh
@@ -185,12 +185,13 @@ PackageMacOSApp()
 PackageWindows()
 {
     local framework="$1"
+    local runtime="$2"
     
     ProgressStart "Creating Windows Package for $framework"
 
-    local folder=$artifactsFolder/windows/$framework/Lidarr
+    local folder=$artifactsFolder/$runtime/$framework/Lidarr
     
-    PackageFiles "$folder" "$framework" "win-x64"
+    PackageFiles "$folder" "$framework" "$runtime"
 
     echo "Removing Lidarr.Mono"
     rm -f $folder/Lidarr.Mono.*
@@ -216,7 +217,7 @@ Package()
             PackageLinux "$framework" "$runtime"
             ;;
         win)
-            PackageWindows "$framework"
+            PackageWindows "$framework" "$runtime"
             ;;
         osx)
             PackageMacOS "$framework"
@@ -234,14 +235,6 @@ PackageTests()
 
     rm -f $testPackageFolder/$framework/$runtime/*.log.config
 
-    # geckodriver.exe isn't copied by dotnet publish
-    if [ "$runtime" = "win-x64" ];
-    then
-        curl -Lso gecko.zip "https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-win64.zip"
-        unzip -o gecko.zip
-        cp geckodriver.exe "$testPackageFolder/$framework/win-x64/publish"
-    fi
-
     ProgressEnd 'Creating Test Package'
 }
 
@@ -320,6 +313,7 @@ then
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
         PackageTests "netcoreapp3.1" "win-x64"
+        PackageTests "netcoreapp3.1" "win-x86"
         PackageTests "netcoreapp3.1" "linux-x64"
         PackageTests "netcoreapp3.1" "linux-musl-x64"
         PackageTests "netcoreapp3.1" "osx-x64"
@@ -352,6 +346,7 @@ then
     if [[ -z "$RID" || -z "$FRAMEWORK" ]];
     then
         Package "netcoreapp3.1" "win-x64"
+        Package "netcoreapp3.1" "win-x86"
         Package "netcoreapp3.1" "linux-x64"
         Package "netcoreapp3.1" "linux-musl-x64"
         Package "netcoreapp3.1" "linux-arm64"
diff --git a/setup/lidarr.iss b/setup/lidarr.iss
index 59b68ba7c..f353c092a 100644
--- a/setup/lidarr.iss
+++ b/setup/lidarr.iss
@@ -48,8 +48,8 @@ Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts
 Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
 
 [Files]
-Source: "..\_artifacts\windows\{#Framework}\Lidarr\Lidarr.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\_artifacts\windows\{#Framework}\Lidarr\*"; Excludes: "Lidarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\_artifacts\{#Runtime}\{#Framework}\Lidarr\Lidarr.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\_artifacts\{#Runtime}\{#Framework}\Lidarr\*"; Excludes: "Lidarr.Update"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b644b710f..5856c20a1 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,8 +5,8 @@
 
     <PlatformTarget>AnyCPU</PlatformTarget>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
-    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64</RuntimeIdentifiers>
-    <ExcludedRuntimeFrameworkPairs>win-x64:net462;osx-x64:net462;linux-arm:net462;linux-arm64:net462;linux-musl-x64:net462;linux-musl-arm64:net462</ExcludedRuntimeFrameworkPairs>
+    <RuntimeIdentifiers>win-x64;win-x86;osx-x64;linux-x64;linux-musl-x64;linux-arm;linux-arm64;linux-musl-arm64</RuntimeIdentifiers>
+    <ExcludedRuntimeFrameworkPairs>win-x64:net462;win-x86:net462;osx-x64:net462;linux-arm:net462;linux-arm64:net462;linux-musl-x64:net462;linux-musl-arm64:net462</ExcludedRuntimeFrameworkPairs>
 
     <LidarrRootDir>$(MSBuildThisFileDirectory)..\</LidarrRootDir>
 
diff --git a/src/NzbDrone/Lidarr.csproj b/src/NzbDrone/Lidarr.csproj
index f765e17b5..e1bd954aa 100644
--- a/src/NzbDrone/Lidarr.csproj
+++ b/src/NzbDrone/Lidarr.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
     <NeutralLanguage>en</NeutralLanguage>
-    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;win-x86</RuntimeIdentifiers>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
diff --git a/src/Runtimes/win-x86/fpcalc.exe b/src/Runtimes/win-x86/fpcalc.exe
new file mode 100644
index 000000000..94d7c81ec
Binary files /dev/null and b/src/Runtimes/win-x86/fpcalc.exe differ