diff --git a/bucket/buck.json b/bucket/buck.json
index 2f89bccb7f8da..13e5ab8310152 100644
--- a/bucket/buck.json
+++ b/bucket/buck.json
@@ -22,7 +22,7 @@
     "post_install": "(Get-Content \"$dir\\buck.bat\") -replace 'C:\\\\Python27', \"$(versiondir 'python27' 'current')\" | Set-Content \"$dir\\buck.bat\"",
     "checkver": {
         "url": "https://chocolatey.org/packages/buck",
-        "regex": "Chocolatey.*?([\\d.]+)\\r"
+        "regex": "\\s+([\\d.]+)</title>"
     },
     "autoupdate": {
         "url": "https://packages.chocolatey.org/buck.$version.nupkg",
diff --git a/bucket/nunit-extension-nunit-project-loader.json b/bucket/nunit-extension-nunit-project-loader.json
index 225710644c854..77e2beec2d267 100644
--- a/bucket/nunit-extension-nunit-project-loader.json
+++ b/bucket/nunit-extension-nunit-project-loader.json
@@ -9,7 +9,7 @@
     "depends": "nunit-console",
     "checkver": {
         "url": "https://chocolatey.org/packages/nunit-extension-nunit-project-loader",
-        "regex": "Chocolatey.*?([\\d.]+)\\r"
+        "regex": "\\s+([\\d.]+)</title>"
     },
     "autoupdate": {
         "url": "https://packages.chocolatey.org/nunit-extension-nunit-project-loader.$version.nupkg",
diff --git a/bucket/nunit-extension-nunit-v2-driver.json b/bucket/nunit-extension-nunit-v2-driver.json
index f3856d906a801..c11d2aa97caea 100644
--- a/bucket/nunit-extension-nunit-v2-driver.json
+++ b/bucket/nunit-extension-nunit-v2-driver.json
@@ -9,7 +9,7 @@
     "depends": "nunit-console",
     "checkver": {
         "url": "https://chocolatey.org/packages/nunit-extension-nunit-v2-driver",
-        "regex": "Chocolatey.*?([\\d.]+)\\r"
+        "regex": "\\s+([\\d.]+)</title>"
     },
     "autoupdate": {
         "url": "https://packages.chocolatey.org/nunit-extension-nunit-v2-driver.$version.nupkg",
diff --git a/bucket/nunit-extension-nunit-v2-result-writer.json b/bucket/nunit-extension-nunit-v2-result-writer.json
index 4004b45d679cb..44afdff77dce5 100644
--- a/bucket/nunit-extension-nunit-v2-result-writer.json
+++ b/bucket/nunit-extension-nunit-v2-result-writer.json
@@ -9,7 +9,7 @@
     "depends": "nunit-console",
     "checkver": {
         "url": "https://chocolatey.org/packages/nunit-extension-nunit-v2-result-writer",
-        "regex": "Chocolatey.*?([\\d.]+)\\r"
+        "regex": "\\s+([\\d.]+)</title>"
     },
     "autoupdate": {
         "url": "https://packages.chocolatey.org/nunit-extension-nunit-v2-result-writer.$version.nupkg",
diff --git a/bucket/nunit-extension-teamcity-event-listener.json b/bucket/nunit-extension-teamcity-event-listener.json
index 590fb6c05baca..9bdf4c2e47262 100644
--- a/bucket/nunit-extension-teamcity-event-listener.json
+++ b/bucket/nunit-extension-teamcity-event-listener.json
@@ -9,7 +9,7 @@
     "depends": "nunit-console",
     "checkver": {
         "url": "https://chocolatey.org/packages/nunit-extension-teamcity-event-listener",
-        "regex": "Chocolatey.*?([\\d.]+)\\r"
+        "regex": "\\s+([\\d.]+)</title>"
     },
     "autoupdate": {
         "url": "https://packages.chocolatey.org/nunit-extension-teamcity-event-listener.$version.nupkg",
diff --git a/bucket/nunit-extension-vs-project-loader.json b/bucket/nunit-extension-vs-project-loader.json
index cfa752c00c7e8..a3e40600aa181 100644
--- a/bucket/nunit-extension-vs-project-loader.json
+++ b/bucket/nunit-extension-vs-project-loader.json
@@ -9,7 +9,7 @@
     "depends": "nunit-console",
     "checkver": {
         "url": "https://chocolatey.org/packages/nunit-extension-vs-project-loader",
-        "regex": "Chocolatey.*?([\\d.]+)\\r"
+        "regex": "\\s+([\\d.]+)</title>"
     },
     "autoupdate": {
         "url": "https://packages.chocolatey.org/nunit-extension-vs-project-loader.$version.nupkg",