diff --git a/bucket/buck.json b/bucket/buck.json
index 2c49139ba4..b1c028ec77 100644
--- a/bucket/buck.json
+++ b/bucket/buck.json
@@ -3,7 +3,6 @@
     "description": "A high-performance build tool.",
     "homepage": "https://buck.build/",
     "license": "Apache-2.0",
-    "depends": "versions/python27",
     "suggest": {
         "JDK8": [
             "java/adopt8-hotspot",
@@ -15,6 +14,7 @@
             "java/zulufx8"
         ]
     },
+    "depends": "versions/python27",
     "url": "https://packages.chocolatey.org/buck.2021.01.12.01.nupkg",
     "hash": "6623ab85184b7f0e0afad2e504423f33c803ada6ce1606886e78ae0565777dd4",
     "extract_dir": "tools",
diff --git a/bucket/dependency-check.json b/bucket/dependency-check.json
index ef87b61485..aa975083f0 100644
--- a/bucket/dependency-check.json
+++ b/bucket/dependency-check.json
@@ -1,7 +1,7 @@
 {
-    "version": "6.1.1",
+    "version": "6.1.5",
     "description": "Software composition analysis utility that identifies project dependencies and checks if there are any known, publicly disclosed, vulnerabilities.",
-    "homepage": "https://www.owasp.org/index.php/OWASP_Dependency_Check",
+    "homepage": "https://owasp.org/www-project-dependency-check/",
     "license": "Apache-2.0",
     "suggest": {
         "JDK": [
@@ -9,8 +9,8 @@
             "java/openjdk"
         ]
     },
-    "url": "https://dl.bintray.com/jeremy-long/owasp/dependency-check-6.1.1-release.zip",
-    "hash": "800d2909b4c4323a1a68d86847b21521f38020fdce330e009affe43297285e40",
+    "url": "https://github.com/jeremylong/DependencyCheck/releases/download/v6.1.5/dependency-check-6.1.5-release.zip",
+    "hash": "54af1e44491cb283cc31d58340110a2c4b98d9362394dee769a1be3c7749e107",
     "extract_dir": "dependency-check",
     "bin": "bin\\dependency-check.bat",
     "checkver": {
@@ -18,9 +18,6 @@
         "regex": "(.+)"
     },
     "autoupdate": {
-        "url": "https://dl.bintray.com/jeremy-long/owasp/dependency-check-$version-release.zip",
-        "hash": {
-            "url": "$url.sha256"
-        }
+        "url": "https://github.com/jeremylong/DependencyCheck/releases/download/v$version/dependency-check-$version-release.zip"
     }
 }
diff --git a/bucket/docker-nightly.json b/bucket/docker-nightly.json
index ea08e114be..ca7c98a370 100644
--- a/bucket/docker-nightly.json
+++ b/bucket/docker-nightly.json
@@ -30,10 +30,6 @@
         "",
         "For help, see https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-docker/configure-docker-daemon"
     ],
-    "depends": [
-        "sudo",
-        "lcow"
-    ],
     "suggest": {
         "Linux container support on Windows": "lcow",
         "Docker Compose": "docker-compose",
@@ -42,6 +38,10 @@
         "Kubernetes Client": "kubectl",
         "compose.yml to kubernetes.yml": "kompose"
     },
+    "depends": [
+        "sudo",
+        "lcow"
+    ],
     "url": "https://master.dockerproject.org/windows/x86_64/docker.zip",
     "extract_dir": "docker",
     "bin": [
diff --git a/bucket/lynx.json b/bucket/lynx.json
index 455fec82d5..30bfaca825 100644
--- a/bucket/lynx.json
+++ b/bucket/lynx.json
@@ -4,10 +4,10 @@
     "description": "Text web browser.",
     "homepage": "https://invisible-island.net/lynx/lynx.html",
     "license": "GPL-2.0-only",
-    "depends": "cacert",
     "suggest": {
         "Microsoft Visual C++ Redistributables 2013": "extras/vcredist2013"
     },
+    "depends": "cacert",
     "url": [
         "https://invisible-island.net/datafiles/current/lynx-newssl-setup.exe",
         "https://slproweb.com/download/Win32OpenSSL_Light-1_1_1j.exe"
diff --git a/bucket/premake.json b/bucket/premake.json
index 5c90c86e32..6cac8b26bd 100644
--- a/bucket/premake.json
+++ b/bucket/premake.json
@@ -7,7 +7,7 @@
     "hash": "a8b9fc87ec06b8fa52587f62be2574bf151c5facadbad99db31b7d4ce6ef1eab",
     "bin": "premake5.exe",
     "checkver": {
-        "url": "https://premake.github.io/download.html",
+        "url": "https://premake.github.io/download",
         "regex": "v(5[\\w.-]+)"
     },
     "autoupdate": {
diff --git a/bucket/vmaf.json b/bucket/vmaf.json
index 690b760b48..49f47d40ca 100644
--- a/bucket/vmaf.json
+++ b/bucket/vmaf.json
@@ -1,13 +1,21 @@
 {
-    "homepage": "https://github.com/Netflix/vmaf",
-    "description": "Perceptual video quality assessment based on multi-method fusion.",
     "version": "2.1.1",
+    "description": "Perceptual video quality assessment based on multi-method fusion.",
+    "homepage": "https://github.com/Netflix/vmaf",
     "license": "BSD-2-Clause-Patent",
-    "url": "https://github.com/Netflix/vmaf/releases/download/v2.1.1/vmaf.exe",
-    "hash": "b3f8116e9183824ab6ceca77419a404b801b9a0d3e7aa163f9a93653c3357e8e",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/Netflix/vmaf/releases/download/v2.1.1/vmaf.exe",
+            "hash": "b3f8116e9183824ab6ceca77419a404b801b9a0d3e7aa163f9a93653c3357e8e"
+        }
+    },
     "bin": "vmaf.exe",
     "checkver": "github",
     "autoupdate": {
-        "url": "https://github.com/Netflix/vmaf/releases/download/v$version/vmaf.exe"
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/Netflix/vmaf/releases/download/v$version/vmaf.exe"
+            }
+        }
     }
 }