diff --git a/bucket/hwinfo.json b/bucket/hwinfo.json
index dd558b7036d871..b5b720e79580d6 100644
--- a/bucket/hwinfo.json
+++ b/bucket/hwinfo.json
@@ -1,79 +1,58 @@
 {
-    "version": "8.30-5800",
+    "version": "8.32",
     "description": "Comprehensive Hardware Analysis, Monitoring and Reporting for Windows and DOS",
     "homepage": "https://www.hwinfo.com",
-    "license": "Freeware",
-    "url": "https://www.sac.sk/download/utildiag/hwi_830.zip",
-    "hash": "eec26737aa2e9224fa1206984d943bd8b5c76e09f7f7f7be982b82634f27491f",
-    "pre_install": [
-        "foreach ($conf in 'HWiNFO64.INI', 'HWiNFO32.INI') {",
-        "    if (!(Test-Path \"$persist_dir\\$conf\")) { Set-Content \"$dir\\$conf\" '[Settings]', 'AutoUpdate=0' -Encoding ASCII }",
-        "}",
-        "if (Test-PATH \"$persist_dir\\HWiNFO64_KEY.txt\" -PathType Leaf) {",
-        "    Copy-Item \"$persist_dir\\HWiNFO64_KEY.txt\" \"$dir\"",
-        "}",
-        "# Remove unwanted executable for x86/x64 installation",
-        "if ($architecture -ne 'arm64') { Remove-Item \"$dir\\HWiNFO_ARM64.exe\" }"
-    ],
+    "license": {
+        "identifier": "Freeware",
+        "url": "https://www.hwinfo.com/licenses"
+    },
+    "url": "https://www.sac.sk/download/utildiag/hwi_832.zip",
+    "hash": "4405ca101962c367da881985072f70ea9533bd018b51e2d0b0203584fbe437f7",
     "architecture": {
         "64bit": {
-            "bin": [
-                [
-                    "HWiNFO64.exe",
-                    "HWiNFO"
-                ]
-            ],
-            "shortcuts": [
-                [
-                    "HWiNFO64.exe",
-                    "HWiNFO"
-                ]
+            "pre_install": [
+                "Get-ChildItem -Path $dir -Include '*32*', '*ARM*' -Recurse | Remove-Item -Force -ErrorAction SilentlyContinue",
+                "Get-ChildItem -Path \"$dir\\*64*\" -Recurse | Rename-Item -NewName { $_.FullName -replace '\\d{2}\\.', '.' }"
             ]
         },
         "32bit": {
-            "bin": [
-                [
-                    "HWiNFO32.exe",
-                    "HWiNFO"
-                ]
-            ],
-            "shortcuts": [
-                [
-                    "HWiNFO32.exe",
-                    "HWiNFO"
-                ]
+            "pre_install": [
+                "Get-ChildItem -Path \"$dir\\*32*\" -Recurse | Rename-Item -NewName { $_.FullName -replace '\\d{2}\\.', '.' }",
+                "Get-ChildItem -Path $dir -Include '*64*' -Recurse | Remove-Item -Force -ErrorAction SilentlyContinue"
             ]
         },
         "arm64": {
-            "bin": [
-                [
-                    "HWiNFO_ARM64.exe",
-                    "HWiNFO"
-                ]
-            ],
-            "shortcuts": [
-                [
-                    "HWiNFO_ARM64.exe",
-                    "HWiNFO"
-                ]
+            "pre_install": [
+                "Get-ChildItem -Path \"$dir\\*ARM*\" -Recurse | Rename-Item -NewName { $_.FullName -replace '_.+\\.', '.' }",
+                "Get-ChildItem -Path $dir -Include '*32*', '*64*' -Recurse | Remove-Item -Force -ErrorAction SilentlyContinue"
             ]
         }
     },
-    "persist": [
-        "HWiNFO64.INI",
-        "HWiNFO32.INI"
+    "installer": {
+        "script": [
+            "$setting_name = if ($architecture -match '\\d{2}(?=bit)') { 'HWiNFO{0}.INI' -f $matches[0] } else { 'HWiNFO_ARM64.INI' }",
+            "if (-not (Test-Path \"$persist_dir\\$setting_name\")) {",
+            "    Set-Content -Path \"$dir\\$setting_name\" -Value '[Settings]', 'AutoUpdate=0' -Encoding ASCII",
+            "}",
+            "persist_data @{ persist = \"$setting_name\" } $original_dir $persist_dir",
+            "Get-ChildItem -Path $persist_dir -File -Include '*64_KEY.txt' -Recurse | Copy-Item -Destination $dir -Force"
+        ]
+    },
+    "bin": "HWiNFO.exe",
+    "shortcuts": [
+        [
+            "HWiNFO.exe",
+            "HWiNFO"
+        ]
     ],
     "pre_uninstall": [
-        "if (Test-PATH \"$dir\\HWiNFO64_KEY.txt\" -PathType Leaf) {",
-        "    if (Test-PATH \"$persist_dir\\HWiNFO64_KEY.txt\" -PathType Container) {",
-        "        Remove-Item \"$persist_dir\\HWiNFO64_KEY.txt\" -Recurse",
-        "    }",
-        "    Copy-Item \"$dir\\HWiNFO64_KEY.txt\" \"$persist_dir\"",
-        "}"
+        "Get-ChildItem -Path $dir -File -Include '*64_KEY.txt' -Recurse | Copy-Item -Destination $persist_dir -Force",
+        "$setting_name = if ($architecture -match '\\d{2}(?=bit)') { 'HWiNFO{0}.INI' -f $matches[0] } else { 'HWiNFO_ARM64.INI' }",
+        "unlink_persist_data @{ persist = \"$setting_name\" } $dir"
     ],
     "checkver": {
-        "url": "https://www.hwinfo.com/ver.txt",
-        "regex": "([\\d-.]+)"
+        "url": "https://www.hwinfo.com/version-history/",
+        "regex": ">v([\\d.-]+)<"
     },
     "autoupdate": {
         "url": "https://www.sac.sk/download/utildiag/hwi_$majorVersion$minorVersion.zip"