diff --git a/bucket/avr-gcc.json b/bucket/avr-gcc.json
index 026818c0a2..c7541e6847 100644
--- a/bucket/avr-gcc.json
+++ b/bucket/avr-gcc.json
@@ -1,7 +1,7 @@
 {
+    "version": "10.1.0",
     "description": "AVR toolchain for Windows by Zak Kemble",
     "homepage": "https://blog.zakkemble.net/avr-gcc-builds/",
-    "version": "10.1.0",
     "license": "BSD-3-Clause",
     "architecture": {
         "64bit": {
@@ -16,10 +16,7 @@
         }
     },
     "bin": "bin\\avr-gcc.exe",
-    "checkver": {
-        "url": "https://blog.zakkemble.net/avr-gcc-builds/",
-        "re": "AVR-GCC ([\\d.]+)"
-    },
+    "checkver": "AVR-GCC ([\\d.]+)",
     "autoupdate": {
         "architecture": {
             "64bit": {
diff --git a/bucket/beeflang.json b/bucket/beeflang.json
index b3b5f47861..89aacc61d4 100644
--- a/bucket/beeflang.json
+++ b/bucket/beeflang.json
@@ -1,7 +1,7 @@
 {
-    "homepage": "https://www.beeflang.org/",
-    "description": "Beef is an open source performance-oriented compiled programming language which has been built hand-in-hand with its IDE environment.",
     "version": "0.42.6",
+    "description": "Performance-oriented compiled programming language which has been built hand-in-hand with its IDE environment.",
+    "homepage": "https://www.beeflang.org",
     "license": "MIT",
     "architecture": {
         "64bit": {
@@ -10,17 +10,17 @@
         }
     },
     "bin": [
-        ["bin\\BeefIDE.exe","beef"],
-        "bin\\BeefBuild.exe"
+        "bin\\BeefBuild.exe",
+        [
+            "bin\\BeefIDE.exe",
+            "beef"
+        ]
     ],
-    "checkver": {
-        "url": "https://www.beeflang.org/",
-        "re": "(?<=Version )(\\d.\\d+.\\d)"
-    },
+    "checkver": ">Version ([\\d.]+)</",
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://github.com/beefytech/Beef/releases/download/$version/BeefSetup_$majorVersion_$minorVersion_$patchVersion.exe#/dl.7z"
+                "url": "https://github.com/beefytech/Beef/releases/download/$version/BeefSetup_$underscoreVersion.exe#/dl.7z"
             }
         }
     }
diff --git a/bucket/pack.json b/bucket/pack.json
index 1e45da5775..601bf2ae2b 100644
--- a/bucket/pack.json
+++ b/bucket/pack.json
@@ -3,11 +3,19 @@
     "description": "Buildpack CLI",
     "homepage": "https://github.com/buildpacks/pack",
     "license": "Apache-2.0",
-    "url": "https://github.com/buildpacks/pack/releases/download/v0.13.1/pack-v0.13.1-windows.zip",
-    "hash": "3db9ca2a64ab26761a0e746c15d0f2585467ab197866ddc90bfdb237a0797174",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/buildpacks/pack/releases/download/v0.13.1/pack-v0.13.1-windows.zip",
+            "hash": "3db9ca2a64ab26761a0e746c15d0f2585467ab197866ddc90bfdb237a0797174"
+        }
+    },
     "bin": "pack.exe",
     "checkver": "github",
     "autoupdate": {
-        "url": "https://github.com/buildpacks/pack/releases/download/v$version/pack-v$version-windows.zip"
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/buildpacks/pack/releases/download/v$version/pack-v$version-windows.zip"
+            }
+        }
     }
 }
diff --git a/bucket/tektoncd-cli.json b/bucket/tektoncd-cli.json
index 8cf219d96d..2fbaf110c8 100644
--- a/bucket/tektoncd-cli.json
+++ b/bucket/tektoncd-cli.json
@@ -1,12 +1,12 @@
 {
-    "version": "0.12.0",
-    "description": "A CLI for interacting with Tekton - a cloud native CI/CD solution.",
+    "version": "0.12.1",
+    "description": "A CLI for interacting with Tekton - a cloud native CI/CD solution",
     "homepage": "https://github.com/tektoncd/cli",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/tektoncd/cli/releases/download/v0.12.0/tkn_0.12.0_Windows_x86_64.zip",
-            "hash": "010a16a73d69d497bf1814d66c8d1c948f9d248632d809ba4c4579a92a4bf309"
+            "url": "https://github.com/tektoncd/cli/releases/download/v0.12.1/tkn_0.12.1_Windows_x86_64.zip",
+            "hash": "097f1cb824ece63ba6a364db0add599e659194257076874db1128a2736159eb7"
         }
     },
     "bin": "tkn.exe",
diff --git a/bucket/winnfsd.json b/bucket/winnfsd.json
index 081063195f..19bdb4b9be 100644
--- a/bucket/winnfsd.json
+++ b/bucket/winnfsd.json
@@ -2,7 +2,7 @@
     "version": "2.4.0",
     "description": "Standalone, simple NFS Server for Windows",
     "homepage": "https://github.com/winnfsd/winnfsd",
-    "license": "GPL",
+    "license": "GPL-2.0-only",
     "url": "https://github.com/winnfsd/winnfsd/releases/download/2.4.0/WinNFSd.exe",
     "hash": "35cb5a74b2bf2aaa94302f5c9ed70786b61f245b96dc1f20214fe337c24af6b2",
     "bin": "WinNFSd.exe",