diff --git a/bucket/msikombustor.json b/bucket/msikombustor.json
index a1909502b6167a..6ab98c899697b1 100644
--- a/bucket/msikombustor.json
+++ b/bucket/msikombustor.json
@@ -1,14 +1,14 @@
 {
-    "version": "4.1.33.0",
+    "version": "4.1.36",
     "description": "A standalone benchmark/stability test tool based on software from the maker of Furmark.",
-    "homepage": "https://geeks3d.com/furmark/kombustor/downloads/",
+    "homepage": "https://www.geeks3d.com/furmark/kombustor/",
     "license": "Freeware",
+    "innosetup": true,
     "architecture": {
         "64bit": {
-            "url": "https://gpuscore.top/msi/MSI_Kombustor4_Setup_v4.1.33.0_x64.exe",
-            "hash": "bcfd3363a187353e664c603aba9f08772b802e7a5924e1ed55206c205ae259b3",
+            "url": "https://geeks3d.com/dl/get/837#/MSI_Kombustor_Setup_v4.1.36_x64.exe",
+            "hash": "f578cbcc7487596756c6b5c9b3f8419375f5232f087154c8ec318196b871eb65",
             "bin": [
-                "MSI-Kombustor-x64.exe",
                 [
                     "MSI-Kombustor-x64.exe",
                     "MSI-Kombustor"
@@ -22,12 +22,18 @@
             ]
         }
     },
-    "innosetup": true,
-    "checkver": "Version ([\\d.]+) -",
+    "checkver": {
+        "url": "https://geeks3d.com/furmark/kombustor/downloads/",
+        "regex": "dl/show/(?<tag>\\d+)(?!.+zip).+?Kombustor\\s+([\\d.]+)"
+    },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://gpuscore.top/msi/MSI_Kombustor4_Setup_v$version_x64.exe"
+                "url": "https://geeks3d.com/dl/get/$matchTag#/MSI_Kombustor_Setup_v$version_x64.exe",
+                "hash": {
+                    "url": "https://geeks3d.com/dl/show/$matchTag",
+                    "regex": "(?i)sha256.+?$sha256<"
+                }
             }
         }
     }