diff --git a/bucket/aws-sam-cli.json b/bucket/aws-sam-cli.json
index 211fd076f9..448de0e391 100644
--- a/bucket/aws-sam-cli.json
+++ b/bucket/aws-sam-cli.json
@@ -1,6 +1,6 @@
 {
     "version": "1.33.0",
-    "description": "The AWS Serverless Application Model (SAM) is an open-source framework for building serverless applications. It provides shorthand syntax to express functions, APIs, databases, and event source mappings. With just a few lines per resource, you can define the application you want and model it using YAML. During deployment, SAM transforms and expands the SAM syntax into AWS CloudFormation syntax, enabling you to build serverless applications faster.",
+    "description": "Build, test, debug, and deploy Serverless applications from CLI",
     "homepage": "https://aws.amazon.com/serverless/sam/",
     "license": "Apache-2.0",
     "suggest": {
@@ -13,13 +13,25 @@
         }
     },
     "extract_dir": "Amazon\\AWSSAMCLI",
-    "bin": "bin\\sam.cmd",
-    "checkver": "github",
+    "bin": [
+        "bin\\sam.cmd",
+        [
+            "bin\\sam.cmd",
+            "aws-sam-cli"
+        ]
+    ],
+    "checkver": {
+        "github": "https://github.com/aws/aws-sam-cli"
+    },
     "autoupdate": {
         "architecture": {
             "64bit": {
                 "url": "https://github.com/aws/aws-sam-cli/releases/download/v$version/AWS_SAM_CLI_64_PY3.msi"
             }
+        },
+        "hash": {
+            "url": "https://github.com/aws/aws-sam-cli/releases/tag/v$version",
+            "regex": "(?sm)>$basename</.*?>\\s*$sha256</"
         }
     }
 }
diff --git a/bucket/flyway.json b/bucket/flyway.json
index 1877907627..3862286e32 100644
--- a/bucket/flyway.json
+++ b/bucket/flyway.json
@@ -1,15 +1,15 @@
 {
-    "version": "8.0.0",
+    "version": "8.0.1",
     "description": "Database migration tool that favors simplicity and convention over configuration.",
     "homepage": "https://flywaydb.org/",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/8.0.0/flyway-commandline-8.0.0-windows-x64.zip",
-            "hash": "sha1:97a08a4b3b3a0fdf42d4990621b96d57627c6735"
+            "url": "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/8.0.1/flyway-commandline-8.0.1-windows-x64.zip",
+            "hash": "sha1:ba8b64da0a8a8e5e0b5035924f9013b8eba1dfdc"
         }
     },
-    "extract_dir": "flyway-8.0.0",
+    "extract_dir": "flyway-8.0.1",
     "bin": "flyway.cmd",
     "persist": [
         "conf",