diff --git a/docs/bash_completion.sh b/docs/bash_completion.sh
index 81f5cf7f..7491fd4f 100644
--- a/docs/bash_completion.sh
+++ b/docs/bash_completion.sh
@@ -454,6 +454,8 @@ _rain_build()
     local_nonpersistent_flags+=("--no-cache")
     flags+=("--omit-patches")
     local_nonpersistent_flags+=("--omit-patches")
+    flags+=("--only-cache")
+    local_nonpersistent_flags+=("--only-cache")
     flags+=("--output=")
     two_word_flags+=("--output")
     two_word_flags+=("-o")
@@ -961,6 +963,8 @@ _rain_deploy()
     local_nonpersistent_flags+=("-k")
     flags+=("--nested-change-set")
     local_nonpersistent_flags+=("--nested-change-set")
+    flags+=("--no-analytics")
+    local_nonpersistent_flags+=("--no-analytics")
     flags+=("--no-exec")
     flags+=("-x")
     local_nonpersistent_flags+=("--no-exec")
@@ -1091,6 +1095,8 @@ _rain_fmt()
     two_word_flags+=("--pkl-package")
     local_nonpersistent_flags+=("--pkl-package")
     local_nonpersistent_flags+=("--pkl-package=")
+    flags+=("--uncdk")
+    local_nonpersistent_flags+=("--uncdk")
     flags+=("--unsorted")
     flags+=("-u")
     local_nonpersistent_flags+=("--unsorted")
@@ -1673,6 +1679,8 @@ _rain_pkg()
     flags+=("-h")
     local_nonpersistent_flags+=("--help")
     local_nonpersistent_flags+=("-h")
+    flags+=("--no-analytics")
+    local_nonpersistent_flags+=("--no-analytics")
     flags+=("--node-style=")
     two_word_flags+=("--node-style")
     local_nonpersistent_flags+=("--node-style")
diff --git a/docs/index.md b/docs/index.md
index 92f9e2e8..fc0caf3f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -36,4 +36,4 @@ Rain is a command line tool for working with AWS CloudFormation templates and st
 * [rain tree](rain_tree.md)	 - Find dependencies of Resources and Outputs in a local template
 * [rain watch](rain_watch.md)	 - Display an updating view of a CloudFormation stack
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_bootstrap.md b/docs/rain_bootstrap.md
index ae84fce3..e9d51b25 100644
--- a/docs/rain_bootstrap.md
+++ b/docs/rain_bootstrap.md
@@ -33,4 +33,4 @@ rain bootstrap
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_build.md b/docs/rain_build.md
index 04946f77..35f96a75 100644
--- a/docs/rain_build.md
+++ b/docs/rain_build.md
@@ -21,6 +21,7 @@ rain build [<resource type>] or <prompt>
       --model string         The ID of the Bedrock model to use for --prompt. Shorthand: claude2, claude3haiku, claude3sonnet, claude3opus, claude3.5sonnet (default "claude2")
       --no-cache             Do not used cached schema files
       --omit-patches         Omit patches and use the raw schema
+      --only-cache           Only use cached schema files
   -o, --output string        Output to a file
       --pkl-class            Output a pkl class based on a resource type schema
   -p, --profile string       AWS profile name; read from the AWS CLI configuration file
@@ -41,4 +42,4 @@ rain build [<resource type>] or <prompt>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_cat.md b/docs/rain_cat.md
index 8f5e6593..13778563 100644
--- a/docs/rain_cat.md
+++ b/docs/rain_cat.md
@@ -35,4 +35,4 @@ rain cat <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_cc.md b/docs/rain_cc.md
index b8e9c65f..d51b9c92 100644
--- a/docs/rain_cc.md
+++ b/docs/rain_cc.md
@@ -33,4 +33,4 @@ You must pass the --experimental (-x) flag to use this command, to acknowledge t
 * [rain cc rm](rain_cc_rm.md)	 - Delete a deployment created by cc deploy (Experimental!)
 * [rain cc state](rain_cc_state.md)	 - Download the state file for a template deployed with cc deploy
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_cc_deploy.md b/docs/rain_cc_deploy.md
index c4e50e06..88fd4314 100644
--- a/docs/rain_cc_deploy.md
+++ b/docs/rain_cc_deploy.md
@@ -40,4 +40,4 @@ rain cc deploy <template> <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_cc_drift.md b/docs/rain_cc_drift.md
index 4ce22da6..50f844c9 100644
--- a/docs/rain_cc_drift.md
+++ b/docs/rain_cc_drift.md
@@ -33,4 +33,4 @@ rain cc drift <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_cc_rm.md b/docs/rain_cc_rm.md
index 8b39fcd5..2962dfab 100644
--- a/docs/rain_cc_rm.md
+++ b/docs/rain_cc_rm.md
@@ -33,4 +33,4 @@ rain cc rm <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_cc_state.md b/docs/rain_cc_state.md
index 8d2297c2..6ca0e12a 100644
--- a/docs/rain_cc_state.md
+++ b/docs/rain_cc_state.md
@@ -33,4 +33,4 @@ rain cc state <name>
 
 * [rain cc](rain_cc.md)	 - Interact with templates using Cloud Control API instead of CloudFormation
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_console.md b/docs/rain_console.md
index 7e11e5f2..7eb955f2 100644
--- a/docs/rain_console.md
+++ b/docs/rain_console.md
@@ -39,4 +39,4 @@ rain console [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_deploy.md b/docs/rain_deploy.md
index 4daa3b40..2826be95 100644
--- a/docs/rain_deploy.md
+++ b/docs/rain_deploy.md
@@ -62,6 +62,7 @@ rain deploy <template> [stack]
       --ignore-unknown-params    Ignore unknown parameters
   -k, --keep                     keep deployed resources after a failure by disabling rollbacks
       --nested-change-set        Whether or not to include nested stacks in the change set (default true)
+      --no-analytics             Do not write analytics to Metadata
   -x, --no-exec                  do not execute the changeset
       --node-style string        Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow (default "original")
       --params strings           set parameter values; use the format key1=value1,key2=value2
@@ -87,4 +88,4 @@ rain deploy <template> [stack]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_diff.md b/docs/rain_diff.md
index 87d904e5..ac36dbac 100644
--- a/docs/rain_diff.md
+++ b/docs/rain_diff.md
@@ -28,4 +28,4 @@ rain diff <from> <to>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_fmt.md b/docs/rain_fmt.md
index 321a7169..ede076fe 100644
--- a/docs/rain_fmt.md
+++ b/docs/rain_fmt.md
@@ -21,6 +21,7 @@ rain fmt <filename>...
   -p, --pkl                  Output the template as Pkl (default format: YAML).
       --pkl-basic            Don't use Pkl modules for output
       --pkl-package string   An alias or full package URI for the Pkl package for generated Pkl files (default "@cfn")
+      --uncdk                Remove CDK Metadata and simplify logical ids
   -u, --unsorted             Do not sort the template's properties.
   -v, --verify               Check if the input is already correctly formatted and exit.
                              The exit status will be 0 if so and 1 if not.
@@ -37,4 +38,4 @@ rain fmt <filename>...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_forecast.md b/docs/rain_forecast.md
index f2c5e4fd..db333971 100644
--- a/docs/rain_forecast.md
+++ b/docs/rain_forecast.md
@@ -55,4 +55,4 @@ rain forecast --experimental <template> [stackName]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_info.md b/docs/rain_info.md
index 3a54fc32..27eaa6e8 100644
--- a/docs/rain_info.md
+++ b/docs/rain_info.md
@@ -30,4 +30,4 @@ rain info
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_logs.md b/docs/rain_logs.md
index 482a8dac..e88b8de8 100644
--- a/docs/rain_logs.md
+++ b/docs/rain_logs.md
@@ -37,4 +37,4 @@ rain logs <stack> (<resource>)
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_ls.md b/docs/rain_ls.md
index 8bfd3542..cada7a7e 100644
--- a/docs/rain_ls.md
+++ b/docs/rain_ls.md
@@ -31,4 +31,4 @@ rain ls <stack> [changeset]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_merge.md b/docs/rain_merge.md
index 2ab21d5e..c3fba0f0 100644
--- a/docs/rain_merge.md
+++ b/docs/rain_merge.md
@@ -30,4 +30,4 @@ rain merge <template> <template> ...
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_module.md b/docs/rain_module.md
index 102ee181..11179e3e 100644
--- a/docs/rain_module.md
+++ b/docs/rain_module.md
@@ -31,4 +31,4 @@ The rain module command can be used to publish modules to CodeArtifact, and to i
 * [rain module install](rain_module_install.md)	 - Install a package of Rain modules from CodeArtifact
 * [rain module publish](rain_module_publish.md)	 - Publish a directory of Rain modules to CodeArtifact
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_module_bootstrap.md b/docs/rain_module_bootstrap.md
index 12ec89c6..9dbef694 100644
--- a/docs/rain_module_bootstrap.md
+++ b/docs/rain_module_bootstrap.md
@@ -29,4 +29,4 @@ rain module bootstrap [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_module_install.md b/docs/rain_module_install.md
index 00a55229..176645ef 100644
--- a/docs/rain_module_install.md
+++ b/docs/rain_module_install.md
@@ -30,4 +30,4 @@ rain module install <name> [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_module_publish.md b/docs/rain_module_publish.md
index 9a34974b..6bb0a7b4 100644
--- a/docs/rain_module_publish.md
+++ b/docs/rain_module_publish.md
@@ -30,4 +30,4 @@ rain module publish <name> [flags]
 
 * [rain module](rain_module.md)	 - Interact with Rain modules in CodeArtifact
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_pkg.md b/docs/rain_pkg.md
index aa8f4581..be25b36d 100644
--- a/docs/rain_pkg.md
+++ b/docs/rain_pkg.md
@@ -50,6 +50,7 @@ rain pkg <template>
       --debug               Output debugging information
   -x, --experimental        Enable experimental features
   -h, --help                help for pkg
+      --no-analytics        Do not include analytics in Metadata
       --node-style string   Set the node output style to tagged, doublequoted, singlequoted, literal, folded, quotescalars, original, or flow
   -o, --output string       Output packaged template to a file
   -p, --profile string      AWS profile name; read from the AWS CLI configuration file
@@ -69,4 +70,4 @@ rain pkg <template>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_rm.md b/docs/rain_rm.md
index 86093ca6..b4d660c7 100644
--- a/docs/rain_rm.md
+++ b/docs/rain_rm.md
@@ -34,4 +34,4 @@ rain rm <stack> [changeset]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_stackset.md b/docs/rain_stackset.md
index ce55b538..ac67f963 100644
--- a/docs/rain_stackset.md
+++ b/docs/rain_stackset.md
@@ -28,4 +28,4 @@ This command manipulates stack sets. It has no action if specific stack set comm
 * [rain stackset ls](rain_stackset_ls.md)	 - List a CloudFormation stack sets in a given region
 * [rain stackset rm](rain_stackset_rm.md)	 - Delete a CloudFormation stack set and/or its instances.
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_stackset_deploy.md b/docs/rain_stackset_deploy.md
index 2028478a..f0c93b3e 100644
--- a/docs/rain_stackset_deploy.md
+++ b/docs/rain_stackset_deploy.md
@@ -12,9 +12,10 @@ Rain will attempt to create an S3 bucket to store artifacts that it packages and
 The bucket's name will be of the format rain-artifacts-<AWS account id>-<AWS region>.
 
 The config flags can be used to set accounts, regions to operate and tags with parameters to use.
-Configuration file with extended options can be provided along with '--config' flag in YAML or JSON format (see example file for details).
+Configuration file with extended options can be provided along with '--config' flag in YAML or JSON format (see [example file](https://github.com/aws-cloudformation/rain/blob/main/test/samples/test-config.yaml) for details).
 
 YAML:
+```
 Parameters:
 	Name: Value
 Tags:
@@ -28,9 +29,10 @@ StackSetInstances:
 	regions:
 		- us-east-1
 		- us-east-2
-...
+	...
+```
 
-Account(s) and region(s) provided as flags OVERRIDE values from configuration files. Tags and parameters from the configuration file are MERGED with CLI flag values. 
+Account(s) and region(s) provided as flags OVERRIDE values from configuration files. Tags and parameters from the configuration file are MERGED with CLI flag values.
 
 
 ```
@@ -68,4 +70,4 @@ rain stackset deploy <template> [stackset] [flags]
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_stackset_ls.md b/docs/rain_stackset_ls.md
index 95fc45a9..8d5d772c 100644
--- a/docs/rain_stackset_ls.md
+++ b/docs/rain_stackset_ls.md
@@ -31,4 +31,4 @@ rain stackset ls <stack set>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_stackset_rm.md b/docs/rain_stackset_rm.md
index 1d3049e4..856f49ae 100644
--- a/docs/rain_stackset_rm.md
+++ b/docs/rain_stackset_rm.md
@@ -31,4 +31,4 @@ rain stackset rm <stackset>
 
 * [rain stackset](rain_stackset.md)	 - This command manipulates stack sets.
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_tree.md b/docs/rain_tree.md
index 08525102..4c49f335 100644
--- a/docs/rain_tree.md
+++ b/docs/rain_tree.md
@@ -30,4 +30,4 @@ rain tree [template]
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/docs/rain_watch.md b/docs/rain_watch.md
index 2c805884..9da2d30b 100644
--- a/docs/rain_watch.md
+++ b/docs/rain_watch.md
@@ -30,4 +30,4 @@ rain watch <stack>
 
 * [rain](index.md)	 - 
 
-###### Auto generated by spf13/cobra on 17-Dec-2024
+###### Auto generated by spf13/cobra on 10-Jan-2025
diff --git a/go.mod b/go.mod
index 84fbe607..c3c38b9b 100644
--- a/go.mod
+++ b/go.mod
@@ -7,14 +7,14 @@ toolchain go1.22.4
 require (
 	//github.com/ake-persson/mapslice-json v0.0.0-20210720081907-22c8edf57807
 	github.com/appscode/jsonpatch v1.0.1
-	github.com/aws/aws-sdk-go-v2 v1.32.7
-	github.com/aws/aws-sdk-go-v2/config v1.28.6
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.47
-	github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.0
-	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.2
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.0
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.2
+	github.com/aws/aws-sdk-go-v2 v1.32.8
+	github.com/aws/aws-sdk-go-v2/config v1.28.10
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.51
+	github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.2
+	github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.4
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.3
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.6
 	github.com/aws/smithy-go v1.22.1
 	github.com/chzyer/readline v1.5.1
 	github.com/google/go-cmp v0.6.0
@@ -23,26 +23,26 @@ require (
 	github.com/nathan-fiscaletti/consolesize-go v0.0.0-20220204101620-317176b6684d
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/sys v0.28.0
-	golang.org/x/term v0.27.0
+	golang.org/x/sys v0.29.0
+	golang.org/x/term v0.28.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/apple/pkl-go v0.8.0
 	github.com/aws/aws-lambda-go v1.47.0
-	github.com/aws/aws-sdk-go-v2/service/acm v1.30.7
-	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.43.1
-	github.com/aws/aws-sdk-go-v2/service/codeartifact v1.33.7
-	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.38.0
-	github.com/aws/aws-sdk-go-v2/service/kms v1.37.8
-	github.com/aws/aws-sdk-go-v2/service/lightsail v1.42.8
-	github.com/aws/aws-sdk-go-v2/service/rds v1.93.0
-	github.com/aws/aws-sdk-go-v2/service/sagemaker v1.169.0
-	github.com/aws/aws-sdk-go-v2/service/servicequotas v1.25.8
-	github.com/aws/aws-sdk-go-v2/service/ssm v1.56.1
+	github.com/aws/aws-sdk-go-v2/service/acm v1.30.10
+	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.44.2
+	github.com/aws/aws-sdk-go-v2/service/codeartifact v1.33.9
+	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.2
+	github.com/aws/aws-sdk-go-v2/service/kms v1.37.10
+	github.com/aws/aws-sdk-go-v2/service/lightsail v1.42.9
+	github.com/aws/aws-sdk-go-v2/service/rds v1.93.4
+	github.com/aws/aws-sdk-go-v2/service/sagemaker v1.172.1
+	github.com/aws/aws-sdk-go-v2/service/servicequotas v1.25.10
+	github.com/aws/aws-sdk-go-v2/service/ssm v1.56.4
 	github.com/fatih/color v1.18.0
-	github.com/gabriel-vasile/mimetype v1.4.7
+	github.com/gabriel-vasile/mimetype v1.4.8
 	github.com/lestrrat-go/jwx/v2 v2.1.3
 	github.com/manifoldco/promptui v0.9.0
 	github.com/mattn/go-runewidth v0.0.15
@@ -50,9 +50,9 @@ require (
 )
 
 require (
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
 	github.com/goccy/go-json v0.10.4 // indirect
@@ -61,35 +61,35 @@ require (
 	github.com/lestrrat-go/httprc v1.0.6 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	golang.org/x/crypto v0.31.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
 )
 
 require (
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.23.3
-	github.com/aws/aws-sdk-go-v2/service/iam v1.38.2
+	github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.23.4
+	github.com/aws/aws-sdk-go-v2/service/iam v1.38.4
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
 	gopkg.in/yaml.v2 v2.4.0
 )
diff --git a/go.sum b/go.sum
index 8bec3eed..939e5e63 100644
--- a/go.sum
+++ b/go.sum
@@ -6,70 +6,130 @@ github.com/aws/aws-lambda-go v1.47.0 h1:0H8s0vumYx/YKs4sE7YM0ktwL2eWse+kfopsRI1s
 github.com/aws/aws-lambda-go v1.47.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A=
 github.com/aws/aws-sdk-go-v2 v1.32.7 h1:ky5o35oENWi0JYWUZkB7WYvVPP+bcRF5/Iq7JWSb5Rw=
 github.com/aws/aws-sdk-go-v2 v1.32.7/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
+github.com/aws/aws-sdk-go-v2 v1.32.8 h1:cZV+NUS/eGxKXMtmyhtYPJ7Z4YLoI/V8bkTdRZfYhGo=
+github.com/aws/aws-sdk-go-v2 v1.32.8/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc=
 github.com/aws/aws-sdk-go-v2/config v1.28.6 h1:D89IKtGrs/I3QXOLNTH93NJYtDhm8SYa9Q5CsPShmyo=
 github.com/aws/aws-sdk-go-v2/config v1.28.6/go.mod h1:GDzxJ5wyyFSCoLkS+UhGB0dArhb9mI+Co4dHtoTxbko=
+github.com/aws/aws-sdk-go-v2/config v1.28.10 h1:fKODZHfqQu06pCzR69KJ3GuttraRJkhlC8g80RZ0Dfg=
+github.com/aws/aws-sdk-go-v2/config v1.28.10/go.mod h1:PvdxRYZ5Um9QMq9PQ0zHHNdtKK+he2NHtFCUFMXWXeg=
 github.com/aws/aws-sdk-go-v2/credentials v1.17.47 h1:48bA+3/fCdi2yAwVt+3COvmatZ6jUDNkDTIsqDiMUdw=
 github.com/aws/aws-sdk-go-v2/credentials v1.17.47/go.mod h1:+KdckOejLW3Ks3b0E3b5rHsr2f9yuORBum0WPnE5o5w=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.51 h1:F/9Sm6Y6k4LqDesZDPJCLxQGXNNHd/ZtJiWd0lCZKRk=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.51/go.mod h1:TKbzCHm43AoPyA+iLGGcruXd4AFhF8tOmLex2R9jWNQ=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 h1:AmoU1pziydclFT/xRV+xXE/Vb8fttJCLRPv8oAkprc0=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21/go.mod h1:AjUdLYe4Tgs6kpH4Bv7uMZo7pottoyHMn4eTcIcneaY=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 h1:IBAoD/1d8A8/1aA8g4MBVtTRHhXRiNAgwdbo/xRM2DI=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23/go.mod h1:vfENuCM7dofkgKpYzuzf1VT1UKkA/YL3qanfBn7HCaA=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 h1:I/5wmGMffY4happ8NOCuIUEWGUvvFp5NSeQcXl9RHcI=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26/go.mod h1:FR8f4turZtNy6baO0KJ5FJUmXH/cSkI9fOngs0yl6mA=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 h1:jSJjSBzw8VDIbWv+mmvBSP8ezsztMYJGH+eKqi9AmNs=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27/go.mod h1:/DAhLbFRgwhmvJdOfSm+WwikZrCuUJiA4WgJG0fTNSw=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 h1:zXFLuEuMMUOvEARXFUVJdfqZ4bvvSgdGRq/ATcrQxzM=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26/go.mod h1:3o2Wpy0bogG1kyOPrgkXA8pgIfEEv0+m19O9D5+W8y8=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 h1:l+X4K77Dui85pIj5foXDhPlnqcNRG2QUyvca300lXh8=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27/go.mod h1:KvZXSFEXm6x84yE8qffKvT3x8J5clWnVFXphpohhzJ8=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25 h1:r67ps7oHCYnflpgDy2LZU0MAQtQbYIOqNNnqGO6xQkE=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.25/go.mod h1:GrGY+Q4fIokYLtjCVB/aFfCVL6hhGUFl8inD18fDalE=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27 h1:AmB5QxnD+fBFrg9LcqzkgF/CaYvMyU/BTlejG4t1S7Q=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27/go.mod h1:Sai7P3xTiyv9ZUYO3IFxMnmiIP759/67iQbU4kdmkyU=
 github.com/aws/aws-sdk-go-v2/service/acm v1.30.7 h1:rv8PVsnReslpDVVByyuX4LzfA7j0+Jcj6Gili1dBEd0=
 github.com/aws/aws-sdk-go-v2/service/acm v1.30.7/go.mod h1:ns7D5/uAekEaVLAIzzNrxVz/CsBCCwNfSdi46PEaGhI=
+github.com/aws/aws-sdk-go-v2/service/acm v1.30.10 h1:zjtYFhXDtAYNMvmB6WN9z6EvwG1NwROU5VZL/A2851s=
+github.com/aws/aws-sdk-go-v2/service/acm v1.30.10/go.mod h1:L2gQdSBABO9hWudBdfRDlxkKNhhUReGFhy6yIwit7aA=
 github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.0 h1:mfV5tcLXeRLbiyI4EHoHWH1sIU7JvbfXVvymUCIgZEo=
 github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.0/go.mod h1:YSSgYnasDKm5OjU3bOPkaz+2PFO6WjEQGIA6KQNsR3Q=
+github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.2 h1:8CcCVDj3hdUJoa1aOxdsKl6c73bC80x9ZylUWCytmgk=
+github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.23.2/go.mod h1:pCst69koE8+hbZ7EohPkOrOhyvqWqXxIVo8cp655yAg=
 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.23.3 h1:CqhKpcm7vRbGqIKq4EgIXyDpFUcNHCn0Y/OhnP0thgs=
 github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.23.3/go.mod h1:+m2sovuoyrrRtwrMDH/RrBq66dpBfEW1BK/4t9VCHqE=
+github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.23.4 h1:SutEGaEEJbOaXO90HBQ42flkaQs4L5eJSvT4Zsaumk0=
+github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.23.4/go.mod h1:EW4j0ChF7B97eNaTM7A+878ErjGdrdggogtBjBapQe4=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.2 h1:6USen+lDo8xYQutfnzhSeNLKEykNmBPfrcBmYKhLP38=
 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.2/go.mod h1:10A7sHyxlTZSB7419K2wq/1tn0x/K9/drbD2j8VRZVc=
+github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.4 h1:uH6So7Ee+2JQf+TKbfifXKUDNN0JfaJ6CgJ6Bh/u1sc=
+github.com/aws/aws-sdk-go-v2/service/cloudformation v1.56.4/go.mod h1:GdDLBO8SzD4wvQ6fhqU1QCmvG1waj1MPHL4cBtuSgdQ=
 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.43.1 h1:riUb1ppQ6Qs0+Yz0bttwlwPIl0AdBAcJdtuKLzsbaI4=
 github.com/aws/aws-sdk-go-v2/service/cloudfront v1.43.1/go.mod h1:fXHLupAMPNGhRAW7e2kS0aoDY/KsQ9GHu80GSK70cRs=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.44.2 h1:2BWjTxlOYCKE3+j4xFmVybChyRinvBG5mdSmodB9CPY=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.44.2/go.mod h1:JaXaFuXF59JpQIDhR3Fj5ZFhB5TGp7MZnIF9f4nYvmk=
 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.33.7 h1:5us9BU1TnHeSqgQEiQCH9qpDbwGEtYAz6fhSL0jiAyA=
 github.com/aws/aws-sdk-go-v2/service/codeartifact v1.33.7/go.mod h1:k6IbvJ+UeAR3ueA7so+YwS+sPoHa99ECNQvbtwt/pxk=
+github.com/aws/aws-sdk-go-v2/service/codeartifact v1.33.9 h1:KafLwAM4bu+ItGB1wtDJJKp7N9syPlhcYXsMAalr3cA=
+github.com/aws/aws-sdk-go-v2/service/codeartifact v1.33.9/go.mod h1:vKxoyommaiAMRIB7BiPBWindIT06gnOWQM3Xci/JxIo=
 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.38.0 h1:isKhHsjpQR3CypQJ4G1g8QWx7zNpiC/xKw1zjgJYVno=
 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.38.0/go.mod h1:xDvUyIkwBwNtVZJdHEwAuhFly3mezwdEWkbJ5oNYwIw=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.2 h1:XcdIh35yg1J8bAiUOLtL/PoPMSGsD72Zanwmim8jEXc=
+github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.2/go.mod h1:516U/KQM3zdcahNBjHUZKGWNfNnIYyt7sxLeqOx78b0=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.0 h1:ivPJXmGlzAjgy0jLO9naExUWE8IM8lLRcRKLPBEx6Q0=
 github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.0/go.mod h1:00zqVNJFK6UASrTnuvjJHJuaqUdkVz5tW8Ip+VhzuNg=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.3 h1:h5UPeMBMm29Vjk45QVnH2Qu2QMbzRrWUORwyGjzWQso=
+github.com/aws/aws-sdk-go-v2/service/ec2 v1.198.3/go.mod h1:WAFpTnWeO2BNfwpQ8LTTTx9l9/bTztMPrA8gkh41PvI=
 github.com/aws/aws-sdk-go-v2/service/iam v1.38.2 h1:8iFKuRj/FJipy/aDZ2lbq0DYuEHdrxp0qVsdi+ZEwnE=
 github.com/aws/aws-sdk-go-v2/service/iam v1.38.2/go.mod h1:UBe4z0VZnbXGp6xaCW1ulE9pndjfpsnrU206rWZcR0Y=
+github.com/aws/aws-sdk-go-v2/service/iam v1.38.4 h1:440YtmP8Cn6Qp7WHYfvz2/Xzmu1v1Vox/FJnzUDDQGM=
+github.com/aws/aws-sdk-go-v2/service/iam v1.38.4/go.mod h1:oXqc4hmGhZpj06Zu8z+ahXhdbjq4Uw8pjN9flty0Ync=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6 h1:HCpPsWqmYQieU7SS6E9HXfdAMSud0pteVXieJmcpIRI=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.6/go.mod h1:ngUiVRCco++u+soRRVBIvBZxSMMvOVMXA4PJ36JLfSw=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8 h1:iwYS40JnrBeA9e9aI5S6KKN4EB2zR4iUVYN0nwVivz4=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8/go.mod h1:Fm9Mi+ApqmFiknZtGpohVcBGvpTu542VC4XO9YudRi0=
 github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.6 h1:nbmKXZzXPJn41CcD4HsHsGWqvKjLKz9kWu6XxvLmf1s=
 github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.6/go.mod h1:SJhcisfKfAawsdNQoZMBEjg+vyN2lH6rO6fP+T94z5Y=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.8 h1:h56mLNgpqWIL7RZOIQO634Xr569bXGTlIE83t/a0LSE=
+github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.8/go.mod h1:kK04550Xx95KI0sNmwoB7ciS9QkRwt9TojhoTMXyJdo=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 h1:50+XsN70RS7dwJ2CkVNXzj7U2L1HKP8nqTd3XWEXBN4=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6/go.mod h1:WqgLmwY7so32kG01zD8CPTJWVWM+TzJoOVHwTg4aPug=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 h1:cWno7lefSH6Pp+mSznagKCgfDGeZRin66UvYUqAkyeA=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8/go.mod h1:tPD+VjU3ABTBoEJ3nctu5Nyg4P4yjqSH5bJGGkY4+XE=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6 h1:BbGDtTi0T1DYlmjBiCr/le3wzhA37O8QTC5/Ab8+EXk=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.6/go.mod h1:hLMJt7Q8ePgViKupeymbqI0la+t9/iYFBjxQCFwuAwI=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8 h1:/Mn7gTedG86nbpjT4QEKsN1D/fThiYe1qvq7WsBGNHg=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8/go.mod h1:Ae3va9LPmvjj231ukHB6UeT8nS7wTPfC3tMZSZMwNYg=
 github.com/aws/aws-sdk-go-v2/service/kms v1.37.8 h1:KbLZjYqhQ9hyB4HwXiheiflTlYQa0+Fz0Ms/rh5f3mk=
 github.com/aws/aws-sdk-go-v2/service/kms v1.37.8/go.mod h1:ANs9kBhK4Ghj9z1W+bsr3WsNaPF71qkgd6eE6Ekol/Y=
+github.com/aws/aws-sdk-go-v2/service/kms v1.37.10 h1:nqYgJ+twjn6hrhTS97j3tlpNXrw4E9N2zQBgw2FAQMg=
+github.com/aws/aws-sdk-go-v2/service/kms v1.37.10/go.mod h1:wHYtyttsH+A6d2MzXYl8cIf4O2Kw1Kg0qzromSX/wOs=
 github.com/aws/aws-sdk-go-v2/service/lightsail v1.42.8 h1:+lmJoqxuUoPlSfGk5JYQQivd9YFjUvRZR6RPY+Wcx48=
 github.com/aws/aws-sdk-go-v2/service/lightsail v1.42.8/go.mod h1:Gg8/myP4+rgRi4+j9gQdbOEnMtwMAUUIeXo+nKCFVj8=
+github.com/aws/aws-sdk-go-v2/service/lightsail v1.42.9 h1:34o9AstfORuhF40AJGBtHvwJB8g4eeHtJlNdD3IN0jY=
+github.com/aws/aws-sdk-go-v2/service/lightsail v1.42.9/go.mod h1:HDPHlS7H2EnMaakVPKQgZbHOxoSJKD9R9ftMeUKoJl8=
 github.com/aws/aws-sdk-go-v2/service/rds v1.93.0 h1:jIqOqvzMvmcHgwjPwHvxPCiLV1P2+hPoBwEH8wkfbZ4=
 github.com/aws/aws-sdk-go-v2/service/rds v1.93.0/go.mod h1:ADD2uROOoEIXjbjDPEvDDZWnGmfKFYMddgKwG5RlBGw=
+github.com/aws/aws-sdk-go-v2/service/rds v1.93.4 h1:7+aSHrS6JJHK9/3MpCwBSvbRMvXEdzB+R4ajfTPjDAo=
+github.com/aws/aws-sdk-go-v2/service/rds v1.93.4/go.mod h1:uIyrtXKiRZAHJYgs6LbLd4YTQf1L4Wy9P7AnoNbZAZc=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0 h1:nyuzXooUNJexRT0Oy0UQY6AhOzxPxhtt4DcBIHyCnmw=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0/go.mod h1:sT/iQz8JK3u/5gZkT+Hmr7GzVZehUMkRZpOaAwYXeGY=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2 h1:a7aQ3RW+ug4IbhoQp29NZdc7vqrzKZZfWZSaQAXOZvQ=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2/go.mod h1:xMekrnhmJ5aqmyxtmALs7mlvXw5xRh+eYjOjvrIIFJ4=
 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.169.0 h1:keGexhxWOl6TmtE3QI+ofpgFIgdMLc3lfkwgjuSXe1o=
 github.com/aws/aws-sdk-go-v2/service/sagemaker v1.169.0/go.mod h1:LoIh7abCP1rQng1kxJVJOTux55TaYN2tVN7G+zNbhus=
+github.com/aws/aws-sdk-go-v2/service/sagemaker v1.172.1 h1:3++lVXBC1ymEmpZTQ9QPWbt6bSeo184mgEUWKjqexhs=
+github.com/aws/aws-sdk-go-v2/service/sagemaker v1.172.1/go.mod h1:2JEk3ogdY++7MjYRJIPdyf5vlIwHb8GfH81tf9ghqyU=
 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.25.8 h1:05g+xF2b6eqAwCeHpl8v6nRY0+u8CpgIOd+vwtnyB10=
 github.com/aws/aws-sdk-go-v2/service/servicequotas v1.25.8/go.mod h1:l6nMNVvoAEbRczyvXiYGChtzbm3UuZdrbMW7/FWelI0=
+github.com/aws/aws-sdk-go-v2/service/servicequotas v1.25.10 h1:jhMvBarCpBxL9/sxIjNY23mtzihUU9bbgzbNz27YWco=
+github.com/aws/aws-sdk-go-v2/service/servicequotas v1.25.10/go.mod h1:WV+4tKbPrBYIwi20IGg4WzHbi2NDpKGTEk6UxwJ7AcE=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.56.1 h1:cfVjoEwOMOJOI6VoRQua0nI0KjZV9EAnR8bKaMeSppE=
 github.com/aws/aws-sdk-go-v2/service/ssm v1.56.1/go.mod h1:fGHwAnTdNrLKhgl+UEeq9uEL4n3Ng4MJucA+7Xi3sC4=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.56.4 h1:oXh/PjaKtStu7RkaUtuKX6+h/OxXriMa9WyQQhylKG0=
+github.com/aws/aws-sdk-go-v2/service/ssm v1.56.4/go.mod h1:IiHGbiFg4wVdEKrvFi/zxVZbjfEpgSe21N9RwyQFXCU=
 github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 h1:rLnYAfXQ3YAccocshIH5mzNNwZBkBo+bP6EhIxak6Hw=
 github.com/aws/aws-sdk-go-v2/service/sso v1.24.7/go.mod h1:ZHtuQJ6t9A/+YDuxOLnbryAmITtr8UysSny3qcyvJTc=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg95gpC2AyDq4hFE8=
+github.com/aws/aws-sdk-go-v2/service/sso v1.24.9/go.mod h1:lV8iQpg6OLOfBnqbGMBKYjilBlf633qwHnBEiMSPoHY=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 h1:JnhTZR3PiYDNKlXy50/pNeix9aGMo6lLpXwJ1mw8MD4=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6/go.mod h1:URronUEGfXZN1VpdktPSD1EkAL9mfrV+2F4sjH38qOY=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 h1:6dBT1Lz8fK11m22R+AqfRsFn8320K0T5DTGxxOQBSMw=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8/go.mod h1:/kiBvRQXBc6xeJTYzhSdGvJ5vm1tjaDEjH+MSeRJnlY=
 github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 h1:s4074ZO1Hk8qv65GqNXqDjmkf4HSQqJukaLuuW0TpDA=
 github.com/aws/aws-sdk-go-v2/service/sts v1.33.2/go.mod h1:mVggCnIWoM09jP71Wh+ea7+5gAp53q+49wDFs1SW5z8=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.6 h1:VwhTrsTuVn52an4mXx29PqRzs2Dvu921NpGk7y43tAM=
+github.com/aws/aws-sdk-go-v2/service/sts v1.33.6/go.mod h1:+8h7PZb3yY5ftmVLD7ocEoE98hdc8PoKS0H3wfx1dlc=
 github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
 github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
@@ -95,6 +155,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
 github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
+github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
 github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
 github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -125,6 +187,8 @@ github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYt
 github.com/manifoldco/promptui v0.9.0/go.mod h1:ka04sppxSGFAtxX0qhlYQjISsg9mR4GWtQEhdbn6Pgg=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
@@ -158,18 +222,28 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavM
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
 golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
+golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
 golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/internal/aws/cfn/all-types.txt b/internal/aws/cfn/all-types.txt
index 95e70a10..b3703ff3 100644
--- a/internal/aws/cfn/all-types.txt
+++ b/internal/aws/cfn/all-types.txt
@@ -197,6 +197,7 @@ AWS::CloudFormation::StackSet
 AWS::CloudFormation::TypeActivation
 AWS::CloudFormation::WaitCondition
 AWS::CloudFormation::WaitConditionHandle
+AWS::CloudFront::AnycastIpList
 AWS::CloudFront::CachePolicy
 AWS::CloudFront::CloudFrontOriginAccessIdentity
 AWS::CloudFront::ContinuousDeploymentPolicy
@@ -305,6 +306,7 @@ AWS::ControlTower::LandingZone
 AWS::CustomerProfiles::CalculatedAttributeDefinition
 AWS::CustomerProfiles::Domain
 AWS::CustomerProfiles::EventStream
+AWS::CustomerProfiles::EventTrigger
 AWS::CustomerProfiles::Integration
 AWS::CustomerProfiles::ObjectType
 AWS::CustomerProfiles::SegmentDefinition
@@ -686,9 +688,6 @@ AWS::InspectorV2::CisScanConfiguration
 AWS::InspectorV2::Filter
 AWS::InternetMonitor::Monitor
 AWS::Invoicing::InvoiceUnit
-AWS::IoT1Click::Device
-AWS::IoT1Click::Placement
-AWS::IoT1Click::Project
 AWS::IoT::AccountAuditConfiguration
 AWS::IoT::Authorizer
 AWS::IoT::BillingGroup
@@ -1028,6 +1027,7 @@ AWS::QBusiness::WebExperience
 AWS::QLDB::Ledger
 AWS::QLDB::Stream
 AWS::QuickSight::Analysis
+AWS::QuickSight::CustomPermissions
 AWS::QuickSight::Dashboard
 AWS::QuickSight::DataSet
 AWS::QuickSight::DataSource
@@ -1214,6 +1214,7 @@ AWS::SageMaker::ModelQualityJobDefinition
 AWS::SageMaker::MonitoringSchedule
 AWS::SageMaker::NotebookInstance
 AWS::SageMaker::NotebookInstanceLifecycleConfig
+AWS::SageMaker::PartnerApp
 AWS::SageMaker::Pipeline
 AWS::SageMaker::Project
 AWS::SageMaker::Space
@@ -1488,6 +1489,16 @@ MongoDB::Atlas::ThirdPartyIntegration
 MongoDB::Atlas::Trigger
 MongoDB::Atlas::X509AuthenticationDatabaseUser
 MongoDb::Atlas::AwsIamDatabaseUser
+NetApp::FSxN::CifsShare
+NetApp::FSxN::ClusterPeer
+NetApp::FSxN::ExportPolicy
+NetApp::FSxN::IGroup
+NetApp::FSxN::Lun
+NetApp::FSxN::SnapMirror
+NetApp::FSxN::Snapshot
+NetApp::FSxN::SnapshotPolicy
+NetApp::FSxN::SvmPeer
+NetApp::FSxN::Volume
 NewRelic::Agent::Configuration
 NewRelic::Alert::AlertsPolicy
 NewRelic::Alert::NrqlConditionStatic
@@ -1516,6 +1527,7 @@ PagerDuty::Users::User
 PaloAltoNetworks::CloudNGFW::NGFW
 PaloAltoNetworks::CloudNGFW::RuleStack
 Redis::Cloud::Database
+Redis::Cloud::Peering
 Redis::Cloud::Subscription
 Redis::CloudFormation::ProDatabase
 Redis::CloudFormation::ProSubscription
diff --git a/internal/aws/cfn/patch.go b/internal/aws/cfn/patch.go
index 7edfff16..f15b011c 100644
--- a/internal/aws/cfn/patch.go
+++ b/internal/aws/cfn/patch.go
@@ -15,6 +15,10 @@ func convertStrings(sa []string) []any {
 }
 
 /*
+
+// We can't patch these since we now run patching during unit tests,
+// and these patches make SDK calls to get enumeration values.
+
 func patchLightsailInstance(schema *Schema) error {
 	blueprintId, found := schema.Properties["BlueprintId"]
 	if !found {
@@ -243,14 +247,21 @@ func patchQuickSightDashboard(schema *Schema) error {
 	name := "GeospatialLayerMapConfiguration"
 	if c, ok := schema.Definitions[name]; ok {
 		badProp := "Interactions"
-		config.Debugf("Found prop %s, removing %s", name, badProp)
+		config.Debugf("Found QuickSight Dashboard def %s, removing %s", name, badProp)
 		delete(c.Properties, badProp)
 	}
 
 	name = "GeospatialMapConfiguration"
 	if c, ok := schema.Definitions[name]; ok {
 		badProp := "Interactions"
-		config.Debugf("Found QuickSight Dashboard prop  %s, removing %s", name, badProp)
+		config.Debugf("Found QuickSight Dashboard def  %s, removing %s", name, badProp)
+		delete(c.Properties, badProp)
+	}
+
+	name = "DashboardPublishOptions"
+	if c, ok := schema.Definitions[name]; ok {
+		badProp := "VisualMenuOption"
+		config.Debugf("Found QuickSight Dashboard def  %s, removing %s", name, badProp)
 		delete(c.Properties, badProp)
 	}
 
diff --git a/internal/aws/cfn/schemas/aws/amazonmq/broker.json b/internal/aws/cfn/schemas/aws/amazonmq/broker.json
index 065e7712..1a0ad640 100644
--- a/internal/aws/cfn/schemas/aws/amazonmq/broker.json
+++ b/internal/aws/cfn/schemas/aws/amazonmq/broker.json
@@ -206,9 +206,6 @@
         "ReplicationUser": {
           "type": "boolean"
         },
-        "ConsoleAccess": {
-          "type": "boolean"
-        },
         "Username": {
           "type": "string"
         },
@@ -219,6 +216,12 @@
             "type": "string"
           }
         },
+        "ConsoleAccess": {
+          "type": "boolean"
+        },
+        "JolokiaApiAccess": {
+          "type": "string"
+        },
         "Password": {
           "type": "string"
         }
diff --git a/internal/aws/cfn/schemas/aws/appconfig/deployment.json b/internal/aws/cfn/schemas/aws/appconfig/deployment.json
index 2a5f9879..b87e478f 100644
--- a/internal/aws/cfn/schemas/aws/appconfig/deployment.json
+++ b/internal/aws/cfn/schemas/aws/appconfig/deployment.json
@@ -1,50 +1,76 @@
 {
   "typeName": "AWS::AppConfig::Deployment",
   "description": "Resource Type definition for AWS::AppConfig::Deployment",
-  "additionalProperties": false,
+  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
   "properties": {
-    "DeploymentStrategyId": {
-      "type": "string"
+    "ApplicationId": {
+      "type": "string",
+      "description": "The application ID.",
+      "relationshipRef": {
+        "typeName": "AWS::AppConfig::Application",
+        "propertyPath": "/properties/ApplicationId"
+      }
     },
     "ConfigurationProfileId": {
-      "type": "string"
+      "type": "string",
+      "description": "The configuration profile ID.",
+      "relationshipRef": {
+        "typeName": "AWS::AppConfig::ConfigurationProfile",
+        "propertyPath": "/properties/ConfigurationProfileId"
+      }
     },
-    "EnvironmentId": {
-      "type": "string"
+    "DeploymentStrategyId": {
+      "type": "string",
+      "description": "The deployment strategy ID.",
+      "relationshipRef": {
+        "typeName": "AWS::AppConfig::DeploymentStrategy",
+        "propertyPath": "/properties/Id"
+      }
     },
-    "KmsKeyIdentifier": {
-      "type": "string"
+    "EnvironmentId": {
+      "type": "string",
+      "description": "The environment ID.",
+      "relationshipRef": {
+        "typeName": "AWS::AppConfig::Environment",
+        "propertyPath": "/properties/EnvironmentId"
+      }
     },
     "Description": {
-      "type": "string"
+      "type": "string",
+      "description": "A description of the deployment."
     },
     "ConfigurationVersion": {
-      "type": "string"
+      "type": "string",
+      "description": "The configuration version to deploy. If deploying an AWS AppConfig hosted configuration version, you can specify either the version number or version label. For all other configurations, you must specify the version number."
     },
-    "Id": {
-      "type": "string"
+    "DeploymentNumber": {
+      "type": "string",
+      "description": "The sequence number of the deployment."
     },
-    "ApplicationId": {
-      "type": "string"
+    "KmsKeyIdentifier": {
+      "type": "string",
+      "description": "The AWS Key Management Service key identifier (key ID, key alias, or key ARN) provided when the resource was created or updated.",
+      "pattern": "^[\\da-f]{8}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{4}-[\\da-f]{12}|alias/[a-zA-Z0-9/_-]{1,250}|arn:aws[a-zA-Z-]*:kms:[a-z]{2}(-gov|-iso(b?))?-[a-z]+-\\d{1}:\\d{12}:(key/[0-9a-f-]{36}|alias/[a-zA-Z0-9/_-]{1,250})$"
     },
     "DynamicExtensionParameters": {
-      "type": "array",
-      "uniqueItems": false,
       "items": {
         "$ref": "#/definitions/DynamicExtensionParameters"
-      }
+      },
+      "type": "array",
+      "uniqueItems": false
     },
     "Tags": {
+      "description": "An array of key-value pairs to apply to this resource.",
       "type": "array",
-      "uniqueItems": false,
+      "uniqueItems": true,
+      "insertionOrder": false,
       "items": {
-        "$ref": "#/definitions/Tags"
+        "$ref": "#/definitions/Tag"
       }
     }
   },
   "definitions": {
     "DynamicExtensionParameters": {
-      "type": "object",
       "additionalProperties": false,
       "properties": {
         "ExtensionReference": {
@@ -56,43 +82,107 @@
         "ParameterValue": {
           "type": "string"
         }
-      }
+      },
+      "type": "object"
     },
-    "Tags": {
+    "Tag": {
+      "description": "Metadata to assign to the deployment. Tags help organize and categorize your AWS AppConfig resources. Each tag consists of a key and an optional value, both of which you define.",
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "Value": {
-          "type": "string"
-        },
         "Key": {
-          "type": "string"
+          "type": "string",
+          "description": "The key-value string map. The valid character set is [a-zA-Z1-9+-=._:/]. The tag key can be up to 128 characters and must not start with aws:."
+        },
+        "Value": {
+          "type": "string",
+          "description": "The tag value can be up to 256 characters."
         }
       }
     }
   },
+  "additionalProperties": false,
   "required": [
-    "DeploymentStrategyId",
+    "ApplicationId",
     "ConfigurationProfileId",
+    "DeploymentStrategyId",
     "EnvironmentId",
-    "ConfigurationVersion",
-    "ApplicationId"
+    "ConfigurationVersion"
   ],
   "createOnlyProperties": [
-    "/properties/KmsKeyIdentifier",
-    "/properties/DeploymentStrategyId",
-    "/properties/ConfigurationVersion",
     "/properties/ApplicationId",
     "/properties/ConfigurationProfileId",
-    "/properties/Tags",
+    "/properties/DeploymentStrategyId",
     "/properties/EnvironmentId",
     "/properties/Description",
+    "/properties/ConfigurationVersion",
+    "/properties/KmsKeyIdentifier",
+    "/properties/DynamicExtensionParameters",
+    "/properties/Tags"
+  ],
+  "writeOnlyProperties": [
     "/properties/DynamicExtensionParameters"
   ],
+  "readOnlyProperties": [
+    "/properties/DeploymentNumber"
+  ],
   "primaryIdentifier": [
-    "/properties/Id"
+    "/properties/ApplicationId",
+    "/properties/EnvironmentId",
+    "/properties/DeploymentNumber"
   ],
-  "readOnlyProperties": [
-    "/properties/Id"
-  ]
+  "handlers": {
+    "create": {
+      "permissions": [
+        "appconfig:StartDeployment",
+        "appconfig:GetDeployment",
+        "appconfig:TagResource",
+        "appconfig:ListTagsForResource",
+        "kms:GenerateDataKey"
+      ],
+      "timeoutInMinutes": 1445
+    },
+    "read": {
+      "permissions": [
+        "appconfig:GetDeployment",
+        "appconfig:ListTagsForResource"
+      ]
+    },
+    "delete": {
+      "permissions": [
+        "appconfig:StopDeployment"
+      ]
+    },
+    "list": {
+      "handlerSchema": {
+        "properties": {
+          "ApplicationId": {
+            "$ref": "resource-schema.json#/properties/ApplicationId"
+          },
+          "EnvironmentId": {
+            "$ref": "resource-schema.json#/properties/EnvironmentId"
+          }
+        },
+        "required": [
+          "ApplicationId",
+          "EnvironmentId"
+        ]
+      },
+      "permissions": [
+        "appconfig:ListDeployments"
+      ]
+    }
+  },
+  "tagging": {
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": false,
+    "cloudFormationSystemTags": true,
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "appconfig:TagResource",
+      "appconfig:UntagResource",
+      "appconfig:ListTagsForResource"
+    ]
+  }
 }
diff --git a/internal/aws/cfn/schemas/aws/backup/logicallyairgappedbackupvault.json b/internal/aws/cfn/schemas/aws/backup/logicallyairgappedbackupvault.json
index 1b8da7c6..242b4ef0 100644
--- a/internal/aws/cfn/schemas/aws/backup/logicallyairgappedbackupvault.json
+++ b/internal/aws/cfn/schemas/aws/backup/logicallyairgappedbackupvault.json
@@ -95,7 +95,9 @@
   ],
   "readOnlyProperties": [
     "/properties/BackupVaultArn",
-    "/properties/EncryptionKeyArn"
+    "/properties/EncryptionKeyArn",
+    "/properties/VaultState",
+    "/properties/VaultType"
   ],
   "primaryIdentifier": [
     "/properties/BackupVaultName"
diff --git a/internal/aws/cfn/schemas/aws/bedrock/agent.json b/internal/aws/cfn/schemas/aws/bedrock/agent.json
index 0f81085d..18ca4434 100644
--- a/internal/aws/cfn/schemas/aws/bedrock/agent.json
+++ b/internal/aws/cfn/schemas/aws/bedrock/agent.json
@@ -196,6 +196,9 @@
         },
         "Parameters": {
           "$ref": "#/definitions/ParameterMap"
+        },
+        "RequireConfirmation": {
+          "$ref": "#/definitions/RequireConfirmation"
         }
       },
       "required": [
@@ -393,6 +396,14 @@
         "KNOWLEDGE_BASE_RESPONSE_GENERATION"
       ]
     },
+    "RequireConfirmation": {
+      "type": "string",
+      "description": "ENUM to check if action requires user confirmation",
+      "enum": [
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
     "S3Identifier": {
       "type": "object",
       "description": "The identifier for the S3 resource.",
diff --git a/internal/aws/cfn/schemas/aws/bedrock/datasource.json b/internal/aws/cfn/schemas/aws/bedrock/datasource.json
index 91898823..0bcc77c7 100644
--- a/internal/aws/cfn/schemas/aws/bedrock/datasource.json
+++ b/internal/aws/cfn/schemas/aws/bedrock/datasource.json
@@ -16,6 +16,9 @@
         },
         "ParsingPrompt": {
           "$ref": "#/definitions/ParsingPrompt"
+        },
+        "ParsingModality": {
+          "$ref": "#/definitions/ParsingModality"
         }
       },
       "required": [
@@ -105,33 +108,6 @@
       "required": [
         "Type"
       ],
-      "oneOf": [
-        {
-          "required": [
-            "S3Configuration"
-          ]
-        },
-        {
-          "required": [
-            "ConfluenceConfiguration"
-          ]
-        },
-        {
-          "required": [
-            "SalesforceConfiguration"
-          ]
-        },
-        {
-          "required": [
-            "SharePointConfiguration"
-          ]
-        },
-        {
-          "required": [
-            "WebConfiguration"
-          ]
-        }
-      ],
       "additionalProperties": false
     },
     "DataSourceStatus": {
@@ -151,7 +127,8 @@
         "CONFLUENCE",
         "SALESFORCE",
         "SHAREPOINT",
-        "WEB"
+        "WEB",
+        "CUSTOM"
       ]
     },
     "DataDeletionPolicy": {
@@ -248,6 +225,9 @@
         },
         "BedrockFoundationModelConfiguration": {
           "$ref": "#/definitions/BedrockFoundationModelConfiguration"
+        },
+        "BedrockDataAutomationConfiguration": {
+          "$ref": "#/definitions/BedrockDataAutomationConfiguration"
         }
       },
       "required": [
@@ -255,6 +235,23 @@
       ],
       "additionalProperties": false
     },
+    "ParsingModality": {
+      "type": "string",
+      "description": "Determine how will parsed content be stored.",
+      "enum": [
+        "MULTIMODAL"
+      ]
+    },
+    "BedrockDataAutomationConfiguration": {
+      "type": "object",
+      "description": "Settings for a Bedrock Data Automation used to parse documents for a data source.",
+      "properties": {
+        "ParsingModality": {
+          "$ref": "#/definitions/ParsingModality"
+        }
+      },
+      "additionalProperties": false
+    },
     "ParsingPrompt": {
       "type": "object",
       "description": "Instructions for interpreting the contents of a document.",
@@ -275,7 +272,8 @@
       "type": "string",
       "description": "The parsing strategy for the data source.",
       "enum": [
-        "BEDROCK_FOUNDATION_MODEL"
+        "BEDROCK_FOUNDATION_MODEL",
+        "BEDROCK_DATA_AUTOMATION"
       ]
     },
     "S3DataSourceConfiguration": {
diff --git a/internal/aws/cfn/schemas/aws/bedrock/knowledgebase.json b/internal/aws/cfn/schemas/aws/bedrock/knowledgebase.json
index a2e47682..f00e3fb1 100644
--- a/internal/aws/cfn/schemas/aws/bedrock/knowledgebase.json
+++ b/internal/aws/cfn/schemas/aws/bedrock/knowledgebase.json
@@ -11,11 +11,13 @@
         },
         "VectorKnowledgeBaseConfiguration": {
           "$ref": "#/definitions/VectorKnowledgeBaseConfiguration"
+        },
+        "KendraKnowledgeBaseConfiguration": {
+          "$ref": "#/definitions/KendraKnowledgeBaseConfiguration"
         }
       },
       "required": [
-        "Type",
-        "VectorKnowledgeBaseConfiguration"
+        "Type"
       ],
       "additionalProperties": false
     },
@@ -45,7 +47,8 @@
       "type": "string",
       "description": "The type of a knowledge base.",
       "enum": [
-        "VECTOR"
+        "VECTOR",
+        "KENDRA"
       ]
     },
     "OpenSearchServerlessConfiguration": {
@@ -55,7 +58,7 @@
         "CollectionArn": {
           "type": "string",
           "maxLength": 2048,
-          "pattern": "^arn:aws:aoss:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:collection/[a-z0-9-]{3,32}$",
+          "pattern": "^arn:aws(|-cn|-us-gov|-iso):aoss:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:collection/[a-z0-9-]{3,32}$",
           "description": "The ARN of the OpenSearch Service vector store."
         },
         "VectorIndexName": {
@@ -479,12 +482,96 @@
         },
         "EmbeddingModelConfiguration": {
           "$ref": "#/definitions/EmbeddingModelConfiguration"
+        },
+        "SupplementalDataStorageConfiguration": {
+          "$ref": "#/definitions/SupplementalDataStorageConfiguration"
         }
       },
       "required": [
         "EmbeddingModelArn"
       ],
       "additionalProperties": false
+    },
+    "S3Location": {
+      "type": "object",
+      "description": "An Amazon S3 location.",
+      "properties": {
+        "URI": {
+          "type": "string",
+          "maxLength": 2048,
+          "minLength": 1,
+          "pattern": "^s3://.{1,128}$",
+          "description": "The location's URI"
+        }
+      },
+      "required": [
+        "URI"
+      ],
+      "additionalProperties": false
+    },
+    "SupplementalDataStorageLocationType": {
+      "type": "string",
+      "description": "Supplemental data storage location type.",
+      "enum": [
+        "S3"
+      ]
+    },
+    "SupplementalDataStorageLocation": {
+      "type": "object",
+      "description": "Supplemental data storage location.",
+      "properties": {
+        "SupplementalDataStorageLocationType": {
+          "$ref": "#/definitions/SupplementalDataStorageLocationType"
+        },
+        "S3Location": {
+          "$ref": "#/definitions/S3Location"
+        }
+      },
+      "required": [
+        "SupplementalDataStorageLocationType"
+      ],
+      "additionalProperties": false
+    },
+    "SupplementalDataStorageLocations": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/SupplementalDataStorageLocation"
+      },
+      "maxItems": 1,
+      "minItems": 1,
+      "description": "List of supplemental data storage locations.",
+      "insertionOrder": false
+    },
+    "SupplementalDataStorageConfiguration": {
+      "type": "object",
+      "description": "Configurations for supplemental data storage.",
+      "properties": {
+        "SupplementalDataStorageLocations": {
+          "$ref": "#/definitions/SupplementalDataStorageLocations"
+        }
+      },
+      "required": [
+        "SupplementalDataStorageLocations"
+      ],
+      "additionalProperties": false
+    },
+    "KendraKnowledgeBaseConfiguration": {
+      "type": "object",
+      "description": "Configurations for a Kendra knowledge base",
+      "properties": {
+        "KendraIndexArn": {
+          "$ref": "#/definitions/KendraIndexArn"
+        }
+      },
+      "required": [
+        "KendraIndexArn"
+      ],
+      "additionalProperties": false
+    },
+    "KendraIndexArn": {
+      "type": "string",
+      "description": "Arn of a Kendra index",
+      "pattern": "^arn:aws(|-cn|-us-gov):kendra:[a-z0-9-]{1,20}:([0-9]{12}|):index/([a-zA-Z0-9][a-zA-Z0-9-]{35}|[a-zA-Z0-9][a-zA-Z0-9-]{35}-[a-zA-Z0-9][a-zA-Z0-9-]{35})$"
     }
   },
   "properties": {
@@ -552,8 +639,7 @@
   "required": [
     "KnowledgeBaseConfiguration",
     "Name",
-    "RoleArn",
-    "StorageConfiguration"
+    "RoleArn"
   ],
   "readOnlyProperties": [
     "/properties/KnowledgeBaseId",
diff --git a/internal/aws/cfn/schemas/aws/bedrock/prompt.json b/internal/aws/cfn/schemas/aws/bedrock/prompt.json
index eca31c1d..dc45147f 100644
--- a/internal/aws/cfn/schemas/aws/bedrock/prompt.json
+++ b/internal/aws/cfn/schemas/aws/bedrock/prompt.json
@@ -6,7 +6,8 @@
       "type": "string",
       "description": "Prompt template type",
       "enum": [
-        "TEXT"
+        "TEXT",
+        "CHAT"
       ]
     },
     "PromptVariant": {
@@ -33,6 +34,9 @@
         },
         "InferenceConfiguration": {
           "$ref": "#/definitions/PromptInferenceConfiguration"
+        },
+        "GenAiResource": {
+          "$ref": "#/definitions/PromptGenAiResource"
         }
       },
       "required": [
@@ -69,6 +73,47 @@
       "required": [],
       "additionalProperties": false
     },
+    "ChatPromptTemplateConfiguration": {
+      "type": "object",
+      "description": "Configuration for chat prompt template",
+      "properties": {
+        "Messages": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Message"
+          },
+          "minItems": 0,
+          "description": "List of messages for chat prompt template",
+          "insertionOrder": true
+        },
+        "System": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SystemContentBlock"
+          },
+          "minItems": 0,
+          "description": "Configuration for chat prompt template",
+          "insertionOrder": true
+        },
+        "ToolConfiguration": {
+          "$ref": "#/definitions/ToolConfiguration"
+        },
+        "InputVariables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PromptInputVariable"
+          },
+          "maxItems": 5,
+          "minItems": 0,
+          "description": "List of input variables",
+          "insertionOrder": true
+        }
+      },
+      "required": [
+        "Messages"
+      ],
+      "additionalProperties": false
+    },
     "PromptTemplateConfiguration": {
       "description": "Prompt template configuration",
       "oneOf": [
@@ -84,6 +129,19 @@
             "Text"
           ],
           "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "title": "Chat",
+          "properties": {
+            "Chat": {
+              "$ref": "#/definitions/ChatPromptTemplateConfiguration"
+            }
+          },
+          "required": [
+            "Chat"
+          ],
+          "additionalProperties": false
         }
       ]
     },
@@ -117,6 +175,232 @@
       ],
       "additionalProperties": false
     },
+    "ConversationRole": {
+      "type": "string",
+      "description": "Conversation roles for the chat prompt",
+      "enum": [
+        "user",
+        "assistant"
+      ]
+    },
+    "ContentBlock": {
+      "description": "Configuration for chat prompt template",
+      "oneOf": [
+        {
+          "title": "Text",
+          "type": "object",
+          "properties": {
+            "Text": {
+              "type": "string",
+              "minLength": 1,
+              "description": "Configuration for chat prompt template"
+            }
+          },
+          "required": [
+            "Text"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "SystemContentBlock": {
+      "description": "Configuration for chat prompt template",
+      "oneOf": [
+        {
+          "title": "Text",
+          "type": "object",
+          "properties": {
+            "Text": {
+              "type": "string",
+              "minLength": 1,
+              "description": "Configuration for chat prompt template"
+            }
+          },
+          "required": [
+            "Text"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "Message": {
+      "type": "object",
+      "description": "Chat prompt Message",
+      "properties": {
+        "Role": {
+          "$ref": "#/definitions/ConversationRole"
+        },
+        "Content": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ContentBlock"
+          },
+          "minItems": 1,
+          "description": "List of Content Blocks",
+          "insertionOrder": true
+        }
+      },
+      "required": [
+        "Role",
+        "Content"
+      ],
+      "additionalProperties": false
+    },
+    "ToolInputSchema": {
+      "description": "Tool input schema",
+      "oneOf": [
+        {
+          "type": "object",
+          "title": "Json",
+          "properties": {
+            "Json": {
+              "type": "object"
+            }
+          },
+          "description": "Tool input schema json",
+          "required": [
+            "Json"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "ToolSpecification": {
+      "type": "object",
+      "description": "Tool specification",
+      "properties": {
+        "Name": {
+          "type": "string",
+          "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$",
+          "minLength": 1,
+          "maxLength": 64,
+          "description": "Tool name"
+        },
+        "Description": {
+          "type": "string",
+          "minLength": 1
+        },
+        "InputSchema": {
+          "$ref": "#/definitions/ToolInputSchema"
+        }
+      },
+      "required": [
+        "Name",
+        "InputSchema"
+      ],
+      "additionalProperties": false
+    },
+    "Tool": {
+      "description": "Tool details",
+      "oneOf": [
+        {
+          "type": "object",
+          "title": "ToolSpec",
+          "properties": {
+            "ToolSpec": {
+              "$ref": "#/definitions/ToolSpecification"
+            }
+          },
+          "required": [
+            "ToolSpec"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "AutoToolChoice": {
+      "type": "object",
+      "description": "Auto Tool choice",
+      "additionalProperties": false
+    },
+    "AnyToolChoice": {
+      "type": "object",
+      "description": "Any Tool choice",
+      "additionalProperties": false
+    },
+    "SpecificToolChoice": {
+      "type": "object",
+      "description": "Specific Tool choice",
+      "properties": {
+        "Name": {
+          "type": "string",
+          "pattern": "^[a-zA-Z][a-zA-Z0-9_]*$",
+          "minLength": 1,
+          "maxLength": 64,
+          "description": "Tool name"
+        }
+      },
+      "required": [
+        "Name"
+      ],
+      "additionalProperties": false
+    },
+    "ToolChoice": {
+      "description": "Tool choice",
+      "oneOf": [
+        {
+          "title": "Auto",
+          "type": "object",
+          "properties": {
+            "Auto": {
+              "$ref": "#/definitions/AutoToolChoice"
+            }
+          },
+          "required": [
+            "Auto"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "title": "Any",
+          "type": "object",
+          "properties": {
+            "Any": {
+              "$ref": "#/definitions/AnyToolChoice"
+            }
+          },
+          "required": [
+            "Any"
+          ],
+          "additionalProperties": false
+        },
+        {
+          "title": "Tool",
+          "type": "object",
+          "properties": {
+            "Tool": {
+              "$ref": "#/definitions/SpecificToolChoice"
+            }
+          },
+          "required": [
+            "Tool"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "ToolConfiguration": {
+      "type": "object",
+      "description": "Tool configuration",
+      "properties": {
+        "Tools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Tool"
+          },
+          "minItems": 1,
+          "description": "List of Tools",
+          "insertionOrder": true
+        },
+        "ToolChoice": {
+          "$ref": "#/definitions/ToolChoice"
+        }
+      },
+      "required": [
+        "Tools"
+      ],
+      "additionalProperties": false
+    },
     "PromptModelInferenceConfiguration": {
       "type": "object",
       "description": "Prompt model inference configuration",
@@ -195,6 +479,40 @@
         }
       },
       "additionalProperties": false
+    },
+    "PromptAgentResource": {
+      "description": "Target Agent to invoke with Prompt",
+      "type": "object",
+      "properties": {
+        "AgentIdentifier": {
+          "type": "string",
+          "maxLength": 2048,
+          "pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:agent-alias/[0-9a-zA-Z]{10}/[0-9a-zA-Z]{10}$",
+          "description": "Arn representation of the Agent Alias."
+        }
+      },
+      "required": [
+        "AgentIdentifier"
+      ],
+      "additionalProperties": false
+    },
+    "PromptGenAiResource": {
+      "description": "Target resource to invoke with Prompt",
+      "oneOf": [
+        {
+          "type": "object",
+          "title": "Agent",
+          "properties": {
+            "Agent": {
+              "$ref": "#/definitions/PromptAgentResource"
+            }
+          },
+          "required": [
+            "Agent"
+          ],
+          "additionalProperties": false
+        }
+      ]
     }
   },
   "properties": {
diff --git a/internal/aws/cfn/schemas/aws/cleanrooms/collaboration.json b/internal/aws/cfn/schemas/aws/cleanrooms/collaboration.json
index 9fec2f56..0cbf4906 100644
--- a/internal/aws/cfn/schemas/aws/cleanrooms/collaboration.json
+++ b/internal/aws/cfn/schemas/aws/cleanrooms/collaboration.json
@@ -56,6 +56,33 @@
       },
       "uniqueItems": true
     },
+    "MLMemberAbilities": {
+      "type": "object",
+      "properties": {
+        "CustomMLMemberAbilities": {
+          "$ref": "#/definitions/CustomMLMemberAbilities"
+        }
+      },
+      "required": [
+        "CustomMLMemberAbilities"
+      ],
+      "additionalProperties": false
+    },
+    "CustomMLMemberAbility": {
+      "type": "string",
+      "enum": [
+        "CAN_RECEIVE_MODEL_OUTPUT",
+        "CAN_RECEIVE_INFERENCE_OUTPUT"
+      ]
+    },
+    "CustomMLMemberAbilities": {
+      "type": "array",
+      "insertionOrder": false,
+      "items": {
+        "$ref": "#/definitions/CustomMLMemberAbility"
+      },
+      "uniqueItems": true
+    },
     "MemberSpecification": {
       "type": "object",
       "properties": {
@@ -68,6 +95,9 @@
         "MemberAbilities": {
           "$ref": "#/definitions/MemberAbilities"
         },
+        "MLMemberAbilities": {
+          "$ref": "#/definitions/MLMemberAbilities"
+        },
         "DisplayName": {
           "$ref": "#/definitions/Name"
         },
@@ -123,6 +153,9 @@
       "properties": {
         "QueryCompute": {
           "$ref": "#/definitions/QueryComputePaymentConfig"
+        },
+        "MachineLearning": {
+          "$ref": "#/definitions/MLPaymentConfig"
         }
       },
       "required": [
@@ -140,6 +173,42 @@
       "required": [
         "IsResponsible"
       ]
+    },
+    "MLPaymentConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "ModelTraining": {
+          "$ref": "#/definitions/ModelTrainingPaymentConfig"
+        },
+        "ModelInference": {
+          "$ref": "#/definitions/ModelInferencePaymentConfig"
+        }
+      }
+    },
+    "ModelTrainingPaymentConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "IsResponsible": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "IsResponsible"
+      ]
+    },
+    "ModelInferencePaymentConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "IsResponsible": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "IsResponsible"
+      ]
     }
   },
   "properties": {
@@ -168,6 +237,9 @@
     "CreatorMemberAbilities": {
       "$ref": "#/definitions/MemberAbilities"
     },
+    "CreatorMLMemberAbilities": {
+      "$ref": "#/definitions/MLMemberAbilities"
+    },
     "DataEncryptionMetadata": {
       "$ref": "#/definitions/DataEncryptionMetadata"
     },
@@ -217,6 +289,7 @@
   "createOnlyProperties": [
     "/properties/CreatorDisplayName",
     "/properties/CreatorMemberAbilities",
+    "/properties/CreatorMLMemberAbilities",
     "/properties/DataEncryptionMetadata",
     "/properties/QueryLogStatus",
     "/properties/Members",
diff --git a/internal/aws/cfn/schemas/aws/cleanrooms/membership.json b/internal/aws/cfn/schemas/aws/cleanrooms/membership.json
index 743335e5..f3466994 100644
--- a/internal/aws/cfn/schemas/aws/cleanrooms/membership.json
+++ b/internal/aws/cfn/schemas/aws/cleanrooms/membership.json
@@ -103,6 +103,9 @@
       "properties": {
         "QueryCompute": {
           "$ref": "#/definitions/MembershipQueryComputePaymentConfig"
+        },
+        "MachineLearning": {
+          "$ref": "#/definitions/MembershipMLPaymentConfig"
         }
       },
       "required": [
@@ -120,6 +123,42 @@
       "required": [
         "IsResponsible"
       ]
+    },
+    "MembershipMLPaymentConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "ModelTraining": {
+          "$ref": "#/definitions/MembershipModelTrainingPaymentConfig"
+        },
+        "ModelInference": {
+          "$ref": "#/definitions/MembershipModelInferencePaymentConfig"
+        }
+      }
+    },
+    "MembershipModelTrainingPaymentConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "IsResponsible": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "IsResponsible"
+      ]
+    },
+    "MembershipModelInferencePaymentConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "IsResponsible": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "IsResponsible"
+      ]
     }
   },
   "properties": {
diff --git a/internal/aws/cfn/schemas/aws/cloudfront/anycastiplist.json b/internal/aws/cfn/schemas/aws/cloudfront/anycastiplist.json
new file mode 100644
index 00000000..eceb2446
--- /dev/null
+++ b/internal/aws/cfn/schemas/aws/cloudfront/anycastiplist.json
@@ -0,0 +1,159 @@
+{
+  "additionalProperties": false,
+  "createOnlyProperties": [
+    "/properties/IpCount",
+    "/properties/Name",
+    "/properties/Tags"
+  ],
+  "definitions": {
+    "AnycastIpList": {
+      "additionalProperties": false,
+      "properties": {
+        "AnycastIps": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "Arn": {
+          "type": "string"
+        },
+        "Id": {
+          "type": "string"
+        },
+        "IpCount": {
+          "type": "integer"
+        },
+        "LastModifiedTime": {
+          "format": "date-time",
+          "type": "string"
+        },
+        "Name": {
+          "maxLength": 64,
+          "minLength": 1,
+          "pattern": "^[a-zA-Z0-9-_]{1,64}$",
+          "type": "string"
+        },
+        "Status": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "AnycastIps",
+        "Arn",
+        "Id",
+        "IpCount",
+        "LastModifiedTime",
+        "Name",
+        "Status"
+      ],
+      "type": "object"
+    },
+    "Tag": {
+      "additionalProperties": false,
+      "properties": {
+        "Key": {
+          "maxLength": 128,
+          "minLength": 1,
+          "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
+          "type": "string"
+        },
+        "Value": {
+          "maxLength": 256,
+          "minLength": 0,
+          "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
+          "type": "string"
+        }
+      },
+      "required": [
+        "Key"
+      ],
+      "type": "object"
+    },
+    "Tags": {
+      "additionalProperties": false,
+      "properties": {
+        "Items": {
+          "items": {
+            "$ref": "#/definitions/Tag"
+          },
+          "type": "array"
+        }
+      },
+      "type": "object"
+    }
+  },
+  "description": "Definition of AWS::CloudFront::AnycastIpList Resource Type",
+  "handlers": {
+    "create": {
+      "permissions": [
+        "cloudfront:CreateAnycastIpList",
+        "cloudfront:TagResource"
+      ]
+    },
+    "delete": {
+      "permissions": [
+        "cloudfront:DeleteAnycastIpList",
+        "cloudfront:GetAnycastIpList"
+      ]
+    },
+    "list": {
+      "permissions": [
+        "cloudfront:ListAnycastIpLists"
+      ]
+    },
+    "read": {
+      "permissions": [
+        "cloudfront:GetAnycastIpList",
+        "cloudfront:ListTagsForResource"
+      ]
+    }
+  },
+  "primaryIdentifier": [
+    "/properties/Id"
+  ],
+  "properties": {
+    "AnycastIpList": {
+      "$ref": "#/definitions/AnycastIpList"
+    },
+    "ETag": {
+      "type": "string"
+    },
+    "Id": {
+      "type": "string"
+    },
+    "IpCount": {
+      "type": "integer"
+    },
+    "Name": {
+      "maxLength": 64,
+      "minLength": 1,
+      "pattern": "^[a-zA-Z0-9-_]{1,64}$",
+      "type": "string"
+    },
+    "Tags": {
+      "$ref": "#/definitions/Tags"
+    }
+  },
+  "readOnlyProperties": [
+    "/properties/AnycastIpList",
+    "/properties/ETag",
+    "/properties/Id"
+  ],
+  "required": [
+    "IpCount",
+    "Name"
+  ],
+  "tagging": {
+    "cloudFormationSystemTags": false,
+    "permissions": [
+      "cloudfront:TagResource",
+      "cloudfront:ListTagsForResource"
+    ],
+    "tagOnCreate": true,
+    "tagProperty": "/properties/Tags",
+    "tagUpdatable": false,
+    "taggable": true
+  },
+  "typeName": "AWS::CloudFront::AnycastIpList"
+}
diff --git a/internal/aws/cfn/schemas/aws/cloudfront/distribution.json b/internal/aws/cfn/schemas/aws/cloudfront/distribution.json
index 2b756b02..c7eee4b2 100644
--- a/internal/aws/cfn/schemas/aws/cloudfront/distribution.json
+++ b/internal/aws/cfn/schemas/aws/cloudfront/distribution.json
@@ -61,7 +61,7 @@
         },
         "GrpcConfig": {
           "$ref": "#/definitions/GrpcConfig",
-          "description": ""
+          "description": "The gRPC configuration for your cache behavior."
         },
         "LambdaFunctionAssociations": {
           "items": {
@@ -200,7 +200,7 @@
         "OriginKeepaliveTimeout": {
           "default": 5,
           "type": "integer",
-          "description": "Specifies how long, in seconds, CloudFront persists its connection to the origin. The minimum timeout is 1 second, the maximum is 60 seconds, and the default (if you don't specify otherwise) is 5 seconds.\n For more information, see [Origin Keep-alive Timeout](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginKeepaliveTimeout) in the *Amazon CloudFront Developer Guide*."
+          "description": "Specifies how long, in seconds, CloudFront persists its connection to the origin. The minimum timeout is 1 second, the maximum is 60 seconds, and the default (if you don't specify otherwise) is 5 seconds.\n For more information, see [Keep-alive timeout (custom origins only)](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginKeepaliveTimeout) in the *Amazon CloudFront Developer Guide*."
         },
         "OriginProtocolPolicy": {
           "type": "string",
@@ -209,7 +209,7 @@
         "OriginReadTimeout": {
           "default": 30,
           "type": "integer",
-          "description": "Specifies how long, in seconds, CloudFront waits for a response from the origin. This is also known as the *origin response timeout*. The minimum timeout is 1 second, the maximum is 60 seconds, and the default (if you don't specify otherwise) is 30 seconds.\n For more information, see [Origin Response Timeout](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginResponseTimeout) in the *Amazon CloudFront Developer Guide*."
+          "description": "Specifies how long, in seconds, CloudFront waits for a response from the origin. This is also known as the *origin response timeout*. The minimum timeout is 1 second, the maximum is 60 seconds, and the default (if you don't specify otherwise) is 30 seconds.\n For more information, see [Response timeout (custom origins only)](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesOriginResponseTimeout) in the *Amazon CloudFront Developer Guide*."
         },
         "OriginSSLProtocols": {
           "default": [
@@ -291,7 +291,7 @@
         },
         "GrpcConfig": {
           "$ref": "#/definitions/GrpcConfig",
-          "description": ""
+          "description": "The gRPC configuration for your cache behavior."
         },
         "LambdaFunctionAssociations": {
           "items": {
@@ -374,6 +374,10 @@
           "uniqueItems": false,
           "description": "A complex type that contains information about CNAMEs (alternate domain names), if any, for this distribution."
         },
+        "AnycastIpListId": {
+          "type": "string",
+          "description": ""
+        },
         "CNAMEs": {
           "items": {
             "type": "string"
@@ -418,7 +422,7 @@
         "DefaultRootObject": {
           "default": "",
           "type": "string",
-          "description": "The object that you want CloudFront to request from your origin (for example, ``index.html``) when a viewer requests the root URL for your distribution (``https://www.example.com``) instead of an object in your distribution (``https://www.example.com/product-description.html``). Specifying a default root object avoids exposing the contents of your distribution.\n Specify only the object name, for example, ``index.html``. Don't add a ``/`` before the object name.\n If you don't want to specify a default root object when you create a distribution, include an empty ``DefaultRootObject`` element.\n To delete the default root object from an existing distribution, update the distribution configuration and include an empty ``DefaultRootObject`` element.\n To replace the default root object, update the distribution configuration and specify the new object.\n For more information about the default root object, see [Creating a Default Root Object](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DefaultRootObject.html) in the *Amazon CloudFront Developer Guide*."
+          "description": "When a viewer requests the root URL for your distribution, the default root object is the object that you want CloudFront to request from your origin. For example, if your root URL is ``https://www.example.com``, you can specify CloudFront to return the ``index.html`` file as the default root object. You can specify a default root object so that viewers see a specific file or object, instead of another object in your distribution (for example, ``https://www.example.com/product-description.html``). A default root object avoids exposing the contents of your distribution.\n You can specify the object name or a path to the object name (for example, ``index.html`` or ``exampleFolderName/index.html``). Your string can't begin with a forward slash (``/``). Only specify the object name or the path to the object.\n If you don't want to specify a default root object when you create a distribution, include an empty ``DefaultRootObject`` element.\n To delete the default root object from an existing distribution, update the distribution configuration and include an empty ``DefaultRootObject`` element.\n To replace the default root object, update the distribution configuration and specify the new object.\n For more information about the default root object, see [Specify a default root object](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DefaultRootObject.html) in the *Amazon CloudFront Developer Guide*."
         },
         "Enabled": {
           "type": "boolean",
@@ -570,14 +574,15 @@
       "additionalProperties": false,
       "properties": {
         "Enabled": {
-          "type": "boolean"
+          "type": "boolean",
+          "description": "Enables your CloudFront distribution to receive gRPC requests and to proxy them directly to your origins."
         }
       },
       "required": [
         "Enabled"
       ],
       "type": "object",
-      "description": ""
+      "description": "Amazon CloudFront supports gRPC, an open-source remote procedure call (RPC) framework built on HTTP/2. gRPC offers bi-directional streaming and binary protocol that buffers payloads, making it suitable for applications that require low latency communications.\n To enable your distribution to handle gRPC requests, you must include HTTP/2 as one of the supported ``HTTP`` versions and allow ``HTTP`` methods, including ``POST``.\n For more information, see [Using gRPC with CloudFront distributions](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-using-grpc.html) in the *Amazon CloudFront Developer Guide*."
     },
     "LambdaFunctionAssociation": {
       "additionalProperties": false,
@@ -660,7 +665,7 @@
       "properties": {
         "Bucket": {
           "type": "string",
-          "description": "The Amazon S3 bucket to store the access logs in, for example, ``myawslogbucket.s3.amazonaws.com``."
+          "description": "The Amazon S3 bucket to store the access logs in, for example, ``amzn-s3-demo-bucket.s3.amazonaws.com``."
         },
         "IncludeCookies": {
           "default": false,
@@ -674,7 +679,7 @@
         }
       },
       "type": "object",
-      "description": "A complex type that controls whether access logs are written for the distribution."
+      "description": "A complex type that specifies whether access logs are written for the distribution.\n  If you already enabled standard logging (legacy) and you want to enable standard logging (v2) to send your access logs to Amazon S3, we recommend that you specify a *different* Amazon S3 bucket or use a *separate path* in the same bucket (for example, use a log prefix or partitioning). This helps you keep track of which log files are associated with which logging subscription and prevents log files from overwriting each other. For more information, see [Standard logging (access logs)](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/AccessLogs.html) in the *Amazon CloudFront Developer Guide*."
     },
     "Origin": {
       "additionalProperties": false,
@@ -768,7 +773,7 @@
         },
         "SelectionCriteria": {
           "$ref": "#/definitions/OriginGroupSelectionCriteria",
-          "description": ""
+          "description": "The selection criteria for the origin group. For more information, see [Create an origin group](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/high_availability_origin_failover.html#concept_origin_groups.creating) in the *Amazon CloudFront Developer Guide*."
         }
       },
       "required": [
@@ -777,7 +782,7 @@
         "Members"
       ],
       "type": "object",
-      "description": "An origin group includes two origins (a primary origin and a second origin to failover to) and a failover criteria that you specify. You create an origin group to support origin failover in CloudFront. When you create or update a distribution, you can specify the origin group instead of a single origin, and CloudFront will failover from the primary origin to the second origin under the failover conditions that you've chosen."
+      "description": "An origin group includes two origins (a primary origin and a secondary origin to failover to) and a failover criteria that you specify. You create an origin group to support origin failover in CloudFront. When you create or update a distribution, you can specify the origin group instead of a single origin, and CloudFront will failover from the primary origin to the secondary origin under the failover conditions that you've chosen.\n Optionally, you can choose selection criteria for your origin group to specify how your origins are selected when your distribution routes viewer requests."
     },
     "OriginGroupFailoverCriteria": {
       "additionalProperties": false,
diff --git a/internal/aws/cfn/schemas/aws/cloudwatch/alarm.json b/internal/aws/cfn/schemas/aws/cloudwatch/alarm.json
index ce291993..d57c557a 100644
--- a/internal/aws/cfn/schemas/aws/cloudwatch/alarm.json
+++ b/internal/aws/cfn/schemas/aws/cloudwatch/alarm.json
@@ -310,6 +310,11 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "cloudwatch:TagResource",
+      "cloudwatch:UntagResource",
+      "cloudwatch:ListTagsForResource"
+    ]
   }
 }
diff --git a/internal/aws/cfn/schemas/aws/cloudwatch/compositealarm.json b/internal/aws/cfn/schemas/aws/cloudwatch/compositealarm.json
index 79fc3ad6..ac68b08f 100644
--- a/internal/aws/cfn/schemas/aws/cloudwatch/compositealarm.json
+++ b/internal/aws/cfn/schemas/aws/cloudwatch/compositealarm.json
@@ -7,7 +7,12 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "cloudwatch:TagResource",
+      "cloudwatch:UntagResource",
+      "cloudwatch:ListTagsForResource"
+    ]
   },
   "properties": {
     "Arn": {
diff --git a/internal/aws/cfn/schemas/aws/connect/queue.json b/internal/aws/cfn/schemas/aws/connect/queue.json
index 4a16dbee..2a20b64d 100644
--- a/internal/aws/cfn/schemas/aws/connect/queue.json
+++ b/internal/aws/cfn/schemas/aws/connect/queue.json
@@ -141,7 +141,6 @@
       "description": "The quick connects available to agents who are working the queue.",
       "type": "array",
       "minItems": 1,
-      "maxItems": 50,
       "insertionOrder": false,
       "items": {
         "$ref": "#/definitions/QuickConnectArn"
diff --git a/internal/aws/cfn/schemas/aws/customerprofiles/eventtrigger.json b/internal/aws/cfn/schemas/aws/customerprofiles/eventtrigger.json
new file mode 100644
index 00000000..4f736985
--- /dev/null
+++ b/internal/aws/cfn/schemas/aws/customerprofiles/eventtrigger.json
@@ -0,0 +1,372 @@
+{
+  "typeName": "AWS::CustomerProfiles::EventTrigger",
+  "description": "An event trigger resource of Amazon Connect Customer Profiles",
+  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-customer-profiles",
+  "definitions": {
+    "DomainName": {
+      "description": "The unique name of the domain.",
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9_-]+$",
+      "minLength": 1,
+      "maxLength": 64
+    },
+    "EventTriggerName": {
+      "description": "The unique name of the event trigger.",
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9_-]+$",
+      "minLength": 1,
+      "maxLength": 64
+    },
+    "ObjectTypeName": {
+      "description": "The unique name of the object type.",
+      "type": "string",
+      "pattern": "^[a-zA-Z_][a-zA-Z_0-9-]*$",
+      "minLength": 1,
+      "maxLength": 255
+    },
+    "Description": {
+      "description": "The description of the event trigger.",
+      "type": "string",
+      "minLength": 1,
+      "maxLength": 1000
+    },
+    "EventTriggerConditions": {
+      "description": "A list of conditions that determine when an event should trigger the destination.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/EventTriggerCondition"
+      },
+      "insertionOrder": false,
+      "minItems": 1,
+      "maxItems": 5
+    },
+    "EventTriggerCondition": {
+      "description": "Specifies the circumstances under which the event should trigger the destination.",
+      "type": "object",
+      "properties": {
+        "EventTriggerDimensions": {
+          "$ref": "#/definitions/EventTriggerDimensions"
+        },
+        "LogicalOperator": {
+          "$ref": "#/definitions/EventTriggerLogicalOperator"
+        }
+      },
+      "required": [
+        "EventTriggerDimensions",
+        "LogicalOperator"
+      ],
+      "additionalProperties": false
+    },
+    "EventTriggerDimensions": {
+      "description": "A list of dimensions to be evaluated for the event.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/EventTriggerDimension"
+      },
+      "insertionOrder": false,
+      "minItems": 1,
+      "maxItems": 10
+    },
+    "EventTriggerDimension": {
+      "description": "A specific event dimension to be assessed.",
+      "type": "object",
+      "properties": {
+        "ObjectAttributes": {
+          "$ref": "#/definitions/ObjectAttributes"
+        }
+      },
+      "required": [
+        "ObjectAttributes"
+      ],
+      "additionalProperties": false
+    },
+    "EventTriggerLogicalOperator": {
+      "description": "The operator used to combine multiple dimensions.",
+      "type": "string",
+      "enum": [
+        "ANY",
+        "ALL",
+        "NONE"
+      ]
+    },
+    "ObjectAttributes": {
+      "description": "A list of object attributes to be evaluated.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/ObjectAttribute"
+      },
+      "insertionOrder": false,
+      "minItems": 1,
+      "maxItems": 10
+    },
+    "ObjectAttribute": {
+      "description": "The criteria that a specific object attribute must meet to trigger the destination.",
+      "type": "object",
+      "properties": {
+        "Source": {
+          "description": "An attribute contained within a source object.",
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 1000
+        },
+        "FieldName": {
+          "description": "A field defined within an object type.",
+          "type": "string",
+          "pattern": "^[a-zA-Z0-9_.-]+$",
+          "minLength": 1,
+          "maxLength": 64
+        },
+        "ComparisonOperator": {
+          "description": "The operator used to compare an attribute against a list of values.",
+          "type": "string",
+          "enum": [
+            "INCLUSIVE",
+            "EXCLUSIVE",
+            "CONTAINS",
+            "BEGINS_WITH",
+            "ENDS_WITH",
+            "GREATER_THAN",
+            "LESS_THAN",
+            "GREATER_THAN_OR_EQUAL",
+            "LESS_THAN_OR_EQUAL",
+            "EQUAL",
+            "BEFORE",
+            "AFTER",
+            "ON",
+            "BETWEEN",
+            "NOT_BETWEEN"
+          ]
+        },
+        "Values": {
+          "description": "A list of attribute values used for comparison.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 255
+          },
+          "insertionOrder": false,
+          "minItems": 1,
+          "maxItems": 10
+        }
+      },
+      "required": [
+        "ComparisonOperator",
+        "Values"
+      ],
+      "additionalProperties": false
+    },
+    "EventTriggerLimits": {
+      "description": "Defines limits controlling whether an event triggers the destination, based on ingestion latency and the number of invocations per profile over specific time periods.",
+      "type": "object",
+      "properties": {
+        "EventExpiration": {
+          "$ref": "#/definitions/EventExpiration"
+        },
+        "Periods": {
+          "$ref": "#/definitions/Periods"
+        }
+      },
+      "additionalProperties": false
+    },
+    "EventExpiration": {
+      "description": "Specifies that an event will only trigger the destination if it is processed within a certain latency period.",
+      "type": "integer",
+      "format": "int64"
+    },
+    "Periods": {
+      "description": "A list of time periods during which the limits apply.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Period"
+      },
+      "insertionOrder": false,
+      "minItems": 1,
+      "maxItems": 4
+    },
+    "Period": {
+      "description": "Defines a limit and the time period during which it is enforced.",
+      "type": "object",
+      "properties": {
+        "Unit": {
+          "description": "The unit of time.",
+          "type": "string",
+          "enum": [
+            "HOURS",
+            "DAYS",
+            "WEEKS",
+            "MONTHS"
+          ]
+        },
+        "Value": {
+          "description": "The amount of time of the specified unit.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 24
+        },
+        "MaxInvocationsPerProfile": {
+          "description": "The maximum allowed number of destination invocations per profile.",
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 1000
+        },
+        "Unlimited": {
+          "description": "If set to true, there is no limit on the number of destination invocations per profile. The default is false.",
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "Unit",
+        "Value"
+      ],
+      "additionalProperties": false
+    },
+    "SegmentFilter": {
+      "description": "The destination is triggered only for profiles that meet the criteria of a segment definition.",
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9_-]+$",
+      "minLength": 1,
+      "maxLength": 64
+    },
+    "Tag": {
+      "description": "A key-value pair to associate with a resource.",
+      "type": "object",
+      "properties": {
+        "Key": {
+          "type": "string",
+          "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
+          "minLength": 1,
+          "maxLength": 128
+        },
+        "Value": {
+          "type": "string",
+          "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
+          "minLength": 0,
+          "maxLength": 256
+        }
+      },
+      "required": [
+        "Key",
+        "Value"
+      ],
+      "additionalProperties": false
+    },
+    "Tags": {
+      "description": "An array of key-value pairs to apply to this resource.",
+      "type": "array",
+      "uniqueItems": true,
+      "insertionOrder": false,
+      "items": {
+        "$ref": "#/definitions/Tag"
+      },
+      "minItems": 0,
+      "maxItems": 50
+    }
+  },
+  "properties": {
+    "DomainName": {
+      "$ref": "#/definitions/DomainName"
+    },
+    "EventTriggerName": {
+      "$ref": "#/definitions/EventTriggerName"
+    },
+    "ObjectTypeName": {
+      "$ref": "#/definitions/ObjectTypeName"
+    },
+    "Description": {
+      "$ref": "#/definitions/Description"
+    },
+    "EventTriggerConditions": {
+      "$ref": "#/definitions/EventTriggerConditions"
+    },
+    "EventTriggerLimits": {
+      "$ref": "#/definitions/EventTriggerLimits"
+    },
+    "SegmentFilter": {
+      "$ref": "#/definitions/SegmentFilter"
+    },
+    "CreatedAt": {
+      "description": "The timestamp of when the event trigger was created.",
+      "type": "string"
+    },
+    "LastUpdatedAt": {
+      "description": "The timestamp of when the event trigger was most recently updated.",
+      "type": "string"
+    },
+    "Tags": {
+      "$ref": "#/definitions/Tags"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "DomainName",
+    "EventTriggerName",
+    "ObjectTypeName",
+    "EventTriggerConditions"
+  ],
+  "tagging": {
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "cloudFormationSystemTags": true,
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "profile:TagResource",
+      "profile:UntagResource",
+      "profile:ListTagsForResource"
+    ]
+  },
+  "createOnlyProperties": [
+    "/properties/DomainName",
+    "/properties/EventTriggerName"
+  ],
+  "readOnlyProperties": [
+    "/properties/CreatedAt",
+    "/properties/LastUpdatedAt"
+  ],
+  "primaryIdentifier": [
+    "/properties/DomainName",
+    "/properties/EventTriggerName"
+  ],
+  "handlers": {
+    "create": {
+      "permissions": [
+        "profile:CreateEventTrigger",
+        "profile:TagResource"
+      ]
+    },
+    "read": {
+      "permissions": [
+        "profile:GetEventTrigger"
+      ]
+    },
+    "update": {
+      "permissions": [
+        "profile:GetEventTrigger",
+        "profile:UpdateEventTrigger",
+        "profile:UntagResource",
+        "profile:TagResource"
+      ]
+    },
+    "delete": {
+      "permissions": [
+        "profile:DeleteEventTrigger"
+      ]
+    },
+    "list": {
+      "handlerSchema": {
+        "properties": {
+          "DomainName": {
+            "$ref": "resource-schema.json#/properties/DomainName"
+          }
+        },
+        "required": [
+          "DomainName"
+        ]
+      },
+      "permissions": [
+        "profile:ListEventTriggers"
+      ]
+    }
+  }
+}
diff --git a/internal/aws/cfn/schemas/aws/datazone/datasource.json b/internal/aws/cfn/schemas/aws/datazone/datasource.json
index b06ac5d4..2577547e 100644
--- a/internal/aws/cfn/schemas/aws/datazone/datasource.json
+++ b/internal/aws/cfn/schemas/aws/datazone/datasource.json
@@ -15,7 +15,7 @@
       "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$"
     },
     "DataSourceConfigurationInput": {
-      "description": "Specifies the configuration of the data source. It can be set to either glueRunConfiguration or redshiftRunConfiguration.",
+      "description": "Specifies the configuration of the data source. It can be set to either glueRunConfiguration or redshiftRunConfiguration or sageMakerRunConfiguration.",
       "oneOf": [
         {
           "type": "object",
@@ -36,6 +36,16 @@
             }
           },
           "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "title": "SageMakerRunConfiguration",
+          "properties": {
+            "SageMakerRunConfiguration": {
+              "$ref": "#/definitions/SageMakerRunConfigurationInput"
+            }
+          },
+          "additionalProperties": false
         }
       ]
     },
@@ -315,6 +325,20 @@
       },
       "insertionOrder": false
     },
+    "SageMakerRunConfigurationInput": {
+      "type": "object",
+      "description": "The configuration details of the Amazon SageMaker data source.",
+      "properties": {
+        "TrackingAssets": {
+          "description": "The tracking assets of the Amazon SageMaker run.",
+          "$ref": "#/definitions/TrackingAssets"
+        }
+      },
+      "required": [
+        "TrackingAssets"
+      ],
+      "additionalProperties": false
+    },
     "ScheduleConfiguration": {
       "type": "object",
       "description": "The schedule of the data source runs.",
@@ -336,6 +360,23 @@
     "Timezone": {
       "type": "string"
     },
+    "TrackingAssets": {
+      "type": "object",
+      "description": "The tracking assets of the Amazon SageMaker run.",
+      "patternProperties": {
+        "^.{1,64}$": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$"
+          },
+          "minItems": 0,
+          "maxItems": 500
+        }
+      },
+      "maxProperties": 1,
+      "additionalProperties": false
+    },
     "TypeRevision": {
       "type": "string",
       "description": "The revision of the metadata form type.",
diff --git a/internal/aws/cfn/schemas/aws/dms/dataprovider.json b/internal/aws/cfn/schemas/aws/dms/dataprovider.json
index 65c70489..71f19733 100644
--- a/internal/aws/cfn/schemas/aws/dms/dataprovider.json
+++ b/internal/aws/cfn/schemas/aws/dms/dataprovider.json
@@ -46,6 +46,29 @@
         "verify-ca",
         "verify-full"
       ]
+    },
+    "MongoDbSslModeValue": {
+      "type": "string",
+      "enum": [
+        "none",
+        "require",
+        "verify-full"
+      ]
+    },
+    "MongoDbAuthType": {
+      "type": "string",
+      "enum": [
+        "no",
+        "password"
+      ]
+    },
+    "MongoDbAuthMechanism": {
+      "type": "string",
+      "enum": [
+        "default",
+        "mongodb_cr",
+        "scram_sha_1"
+      ]
     }
   },
   "properties": {
@@ -83,12 +106,16 @@
       "description": "The property describes a data engine for the data provider.",
       "type": "string",
       "enum": [
-        "postgres",
+        "aurora",
+        "aurora_postgresql",
         "mysql",
         "oracle",
+        "postgres",
         "sqlserver",
-        "aurora",
-        "aurora_postgresql"
+        "redshift",
+        "mariadb",
+        "mongodb",
+        "docdb"
       ]
     },
     "ExactSettings": {
@@ -226,6 +253,118 @@
             "DatabaseName"
           ],
           "additionalProperties": false
+        },
+        "RedshiftSettings": {
+          "description": "RedshiftSettings property identifier.",
+          "type": "object",
+          "properties": {
+            "ServerName": {
+              "type": "string"
+            },
+            "Port": {
+              "type": "integer"
+            },
+            "DatabaseName": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "ServerName",
+            "Port",
+            "DatabaseName"
+          ],
+          "additionalProperties": false
+        },
+        "MariaDbSettings": {
+          "description": "MariaDbSettings property identifier.",
+          "type": "object",
+          "properties": {
+            "ServerName": {
+              "type": "string"
+            },
+            "Port": {
+              "type": "integer"
+            },
+            "SslMode": {
+              "type": "object",
+              "$ref": "#/definitions/DmsSslModeValue"
+            },
+            "CertificateArn": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "ServerName",
+            "Port",
+            "SslMode"
+          ],
+          "additionalProperties": false
+        },
+        "DocDbSettings": {
+          "description": "DocDbSettings property identifier.",
+          "type": "object",
+          "properties": {
+            "ServerName": {
+              "type": "string"
+            },
+            "Port": {
+              "type": "integer"
+            },
+            "DatabaseName": {
+              "type": "string"
+            },
+            "SslMode": {
+              "type": "object",
+              "$ref": "#/definitions/MongoDbSslModeValue"
+            },
+            "CertificateArn": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "ServerName",
+            "Port",
+            "DatabaseName"
+          ],
+          "additionalProperties": false
+        },
+        "MongoDbSettings": {
+          "description": "MongoDbSettings property identifier.",
+          "type": "object",
+          "properties": {
+            "ServerName": {
+              "type": "string"
+            },
+            "Port": {
+              "type": "integer"
+            },
+            "DatabaseName": {
+              "type": "string"
+            },
+            "SslMode": {
+              "type": "object",
+              "$ref": "#/definitions/MongoDbSslModeValue"
+            },
+            "CertificateArn": {
+              "type": "string"
+            },
+            "AuthType": {
+              "type": "object",
+              "$ref": "#/definitions/MongoDbAuthType"
+            },
+            "AuthSource": {
+              "type": "string"
+            },
+            "AuthMechanism": {
+              "type": "object",
+              "$ref": "#/definitions/MongoDbAuthMechanism"
+            }
+          },
+          "required": [
+            "ServerName",
+            "Port"
+          ],
+          "additionalProperties": false
         }
       },
       "anyOf": [
@@ -248,6 +387,26 @@
           "required": [
             "MicrosoftSqlServerSettings"
           ]
+        },
+        {
+          "required": [
+            "RedshiftSettings"
+          ]
+        },
+        {
+          "required": [
+            "DocDbSettings"
+          ]
+        },
+        {
+          "required": [
+            "MariaDbSettings"
+          ]
+        },
+        {
+          "required": [
+            "MongoDbSettings"
+          ]
         }
       ],
       "additionalProperties": false
diff --git a/internal/aws/cfn/schemas/aws/docdb/dbcluster.json b/internal/aws/cfn/schemas/aws/docdb/dbcluster.json
index c6a4448b..72f04227 100644
--- a/internal/aws/cfn/schemas/aws/docdb/dbcluster.json
+++ b/internal/aws/cfn/schemas/aws/docdb/dbcluster.json
@@ -27,6 +27,9 @@
     "Endpoint": {
       "type": "string"
     },
+    "RotateMasterUserPassword": {
+      "type": "boolean"
+    },
     "VpcSecurityGroupIds": {
       "type": "array",
       "uniqueItems": false,
@@ -69,6 +72,9 @@
     "PreferredMaintenanceWindow": {
       "type": "string"
     },
+    "MasterUserSecretKmsKeyId": {
+      "type": "string"
+    },
     "DBSubnetGroupName": {
       "type": "string"
     },
@@ -78,6 +84,9 @@
     "UseLatestRestorableTime": {
       "type": "boolean"
     },
+    "ManageMasterUserPassword": {
+      "type": "boolean"
+    },
     "MasterUserPassword": {
       "type": "string"
     },
diff --git a/internal/aws/cfn/schemas/aws/dynamodb/globaltable.json b/internal/aws/cfn/schemas/aws/dynamodb/globaltable.json
index ae2f38b8..b3b59b89 100644
--- a/internal/aws/cfn/schemas/aws/dynamodb/globaltable.json
+++ b/internal/aws/cfn/schemas/aws/dynamodb/globaltable.json
@@ -46,6 +46,9 @@
         "$ref": "#/definitions/LocalSecondaryIndex"
       }
     },
+    "PointInTimeRecoverySpecification": {
+      "$ref": "#/definitions/PointInTimeRecoverySpecification"
+    },
     "WriteProvisionedThroughputSettings": {
       "$ref": "#/definitions/WriteProvisionedThroughputSettings"
     },
@@ -164,7 +167,17 @@
       "properties": {
         "PointInTimeRecoveryEnabled": {
           "type": "boolean"
+        },
+        "RecoveryPeriodInDays": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 35
         }
+      },
+      "dependencies": {
+        "RecoveryPeriodInDays": [
+          "PointInTimeRecoveryEnabled"
+        ]
       }
     },
     "ReplicaSpecification": {
diff --git a/internal/aws/cfn/schemas/aws/dynamodb/table.json b/internal/aws/cfn/schemas/aws/dynamodb/table.json
index 8bc46b51..312714a3 100644
--- a/internal/aws/cfn/schemas/aws/dynamodb/table.json
+++ b/internal/aws/cfn/schemas/aws/dynamodb/table.json
@@ -381,7 +381,18 @@
         "PointInTimeRecoveryEnabled": {
           "description": "Indicates whether point in time recovery is enabled (true) or disabled (false) on the table.",
           "type": "boolean"
+        },
+        "RecoveryPeriodInDays": {
+          "maximum": 35,
+          "description": "",
+          "type": "integer",
+          "minimum": 1
         }
+      },
+      "dependencies": {
+        "RecoveryPeriodInDays": [
+          "PointInTimeRecoveryEnabled"
+        ]
       }
     },
     "ProvisionedThroughput": {
diff --git a/internal/aws/cfn/schemas/aws/ec2/launchtemplate.json b/internal/aws/cfn/schemas/aws/ec2/launchtemplate.json
index 40459f62..e9efe541 100644
--- a/internal/aws/cfn/schemas/aws/ec2/launchtemplate.json
+++ b/internal/aws/cfn/schemas/aws/ec2/launchtemplate.json
@@ -70,15 +70,14 @@
         },
         "TagSpecifications": {
           "uniqueItems": false,
-          "description": "The tags to apply to the resources that are created during instance launch.\n To tag a resource after it has been created, see [CreateTags](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html).\n To tag the launch template itself, use [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-tagspecifications).",
+          "description": "The tags to apply to resources that are created during instance launch.\n To tag the launch template itself, use [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-tagspecifications).",
           "type": "array",
           "items": {
             "$ref": "#/definitions/TagSpecification"
           }
         },
         "NetworkPerformanceOptions": {
-          "description": "",
-          "$ref": "#/definitions/NetworkPerformanceOptions"
+          "description": ""
         },
         "UserData": {
           "description": "The user data to make available to the instance. You must provide base64-encoded text. User data is limited to 16 KB. For more information, see [Run commands on your Amazon EC2 instance at launch](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) in the *Amazon EC2 User Guide*.\n If you are creating the launch template for use with BATCH, the user data must be provided in the [MIME multi-part archive format](https://docs.aws.amazon.com/https://cloudinit.readthedocs.io/en/latest/topics/format.html#mime-multi-part-archive). For more information, see [Amazon EC2 user data in launch templates](https://docs.aws.amazon.com/batch/latest/userguide/launch-templates.html) in the *User Guide*.",
@@ -118,7 +117,7 @@
         },
         "ElasticInferenceAccelerators": {
           "uniqueItems": false,
-          "description": "An elastic inference accelerator to associate with the instance. Elastic inference accelerators are a resource you can attach to your Amazon EC2 instances to accelerate your Deep Learning (DL) inference workloads.\n You cannot specify accelerators from different generations in the same request.\n  Starting April 15, 2023, AWS will not onboard new customers to Amazon Elastic Inference (EI), and will help current customers migrate their workloads to options that offer better price and performance. After April 15, 2023, new customers will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once during the past 30-day period are considered current customers and will be able to continue using the service.",
+          "description": "Amazon Elastic Inference is no longer available.\n  An elastic inference accelerator to associate with the instance. Elastic inference accelerators are a resource you can attach to your Amazon EC2 instances to accelerate your Deep Learning (DL) inference workloads.\n You cannot specify accelerators from different generations in the same request.\n  Starting April 15, 2023, AWS will not onboard new customers to Amazon Elastic Inference (EI), and will help current customers migrate their workloads to options that offer better price and performance. After April 15, 2023, new customers will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker, Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once during the past 30-day period are considered current customers and will be able to continue using the service.",
           "type": "array",
           "items": {
             "$ref": "#/definitions/LaunchTemplateElasticInferenceAccelerator"
@@ -205,7 +204,7 @@
           "$ref": "#/definitions/InstanceMarketOptions"
         },
         "InstanceRequirements": {
-          "description": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n You must specify ``VCpuCount`` and ``MemoryMiB``. All other attributes are optional. Any unspecified optional attribute is set to its default.\n When you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n To limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n  +   ``AllowedInstanceTypes`` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n  +   ``ExcludedInstanceTypes`` - The instance types to exclude from the list, even if they match your specified attributes.\n  \n  If you specify ``InstanceRequirements``, you can't specify ``InstanceType``.\n Attribute-based instance type selection is only supported when using Auto Scaling groups, EC2 Fleet, and Spot Fleet to launch instances. If you plan to use the launch template in the [launch instance wizard](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-instance-wizard.html), or with the [RunInstances](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html) API or [AWS::EC2::Instance](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html) AWS CloudFormation resource, you can't specify ``InstanceRequirements``.\n  For more information, see [Attribute-based instance type selection for EC2 Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html), [Attribute-based instance type selection for Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-attribute-based-instance-type-selection.html), and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide*.",
+          "description": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n You must specify ``VCpuCount`` and ``MemoryMiB``. All other attributes are optional. Any unspecified optional attribute is set to its default.\n When you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n To limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n  +   ``AllowedInstanceTypes`` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n  +   ``ExcludedInstanceTypes`` - The instance types to exclude from the list, even if they match your specified attributes.\n  \n  If you specify ``InstanceRequirements``, you can't specify ``InstanceType``.\n Attribute-based instance type selection is only supported when using Auto Scaling groups, EC2 Fleet, and Spot Fleet to launch instances. If you plan to use the launch template in the [launch instance wizard](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-instance-wizard.html), or with the [RunInstances](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html) API or [AWS::EC2::Instance](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html) AWS CloudFormation resource, you can't specify ``InstanceRequirements``.\n  For more information, see [Specify attributes for instance type selection for EC2 Fleet or Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html) and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide*.",
           "$ref": "#/definitions/InstanceRequirements"
         },
         "RamDiskId": {
@@ -267,11 +266,12 @@
       }
     },
     "Cpu": {
-      "description": "",
+      "description": "Specifies the CPU performance to consider when using an instance family as the baseline reference.",
       "additionalProperties": false,
       "type": "object",
       "properties": {
         "References": {
+          "description": "The instance family to use as the baseline reference for CPU performance. All instance types that match your specified attributes are compared against the CPU performance of the referenced instance family, regardless of CPU manufacturer or architecture differences.",
           "$ref": "#/definitions/References"
         }
       }
@@ -415,7 +415,7 @@
           "type": "string"
         },
         "KmsKeyId": {
-          "description": "The ARN of the symmetric KMSlong (KMS) CMK used for encryption.",
+          "description": "Identifier (key ID, key alias, key ARN, or alias ARN) of the customer managed KMS key to use for EBS encryption.",
           "type": "string"
         },
         "Encrypted": {
@@ -543,12 +543,12 @@
       }
     },
     "Reference": {
-      "description": "",
+      "description": "Specifies an instance family to use as the baseline reference for CPU performance.",
       "additionalProperties": false,
       "type": "object",
       "properties": {
         "InstanceFamily": {
-          "description": "The instance family to refer. Ensure that you specify the correct family name. For example, C6i and C6g are valid values, but C6 is not.",
+          "description": "The instance family to use as a baseline reference.\n  Ensure that you specify the correct value for the instance family. The instance family is everything before the period (``.``) in the instance type name. For example, in the instance type ``c6i.large``, the instance family is ``c6i``, not ``c6``. For more information, see [Amazon EC2 instance type naming conventions](https://docs.aws.amazon.com/ec2/latest/instancetypes/instance-type-names.html) in *Amazon EC2 Instance Types*.\n  The following instance families are *not supported* for performance protection:\n  +   ``c1`` \n  +   ``g3`` | ``g3s`` \n  +   ``hpc7g`` \n  +   ``m1`` | ``m2`` \n  +   ``mac1`` | ``mac2`` | ``mac2-m1ultra`` | ``mac2-m2`` | ``mac2-m2pro`` \n  +   ``p3dn`` | ``p4d`` | ``p5`` \n  +   ``t1`` \n  +   ``u-12tb1`` | ``u-18tb1`` | ``u-24tb1`` | ``u-3tb1`` | ``u-6tb1`` | ``u-9tb1`` | ``u7i-12tb`` | ``u7in-16tb`` | ``u7in-24tb`` | ``u7in-32tb`` \n  \n If you enable performance protection by specifying a supported instance family, the returned instance types will exclude the above unsupported instance families.",
           "type": "string"
         }
       }
@@ -685,7 +685,7 @@
           "type": "integer"
         },
         "InterfaceType": {
-          "description": "The type of network interface. To create an Elastic Fabric Adapter (EFA), specify ``efa``. For more information, see [Elastic Fabric Adapter](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html) in the *Amazon EC2 User Guide*.\n If you are not creating an EFA, specify ``interface`` or omit this parameter.\n Valid values: ``interface`` | ``efa``",
+          "description": "The type of network interface. To create an Elastic Fabric Adapter (EFA), specify ``efa`` or ``efa``. For more information, see [Elastic Fabric Adapter](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/efa.html) in the *Amazon EC2 User Guide*.\n If you are not creating an EFA, specify ``interface`` or omit this parameter.\n If you specify ``efa-only``, do not assign any IP addresses to the network interface. EFA-only network interfaces do not support IP addresses.\n Valid values: ``interface`` | ``efa`` | ``efa-only``",
           "type": "string"
         },
         "AssociateCarrierIpAddress": {
@@ -764,7 +764,7 @@
       }
     },
     "LaunchTemplateTagSpecification": {
-      "description": "Specifies the tags to apply to the launch template during creation.\n  ``LaunchTemplateTagSpecification`` is a property of [AWS::EC2::LaunchTemplate](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html).",
+      "description": "Specifies the tags to apply to the launch template during creation.\n To specify the tags for the resources that are created during instance launch, use [AWS::EC2::LaunchTemplate TagSpecification](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html).\n  ``LaunchTemplateTagSpecification`` is a property of [AWS::EC2::LaunchTemplate](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html).",
       "additionalProperties": false,
       "type": "object",
       "properties": {
@@ -783,7 +783,7 @@
       }
     },
     "TagSpecification": {
-      "description": "Specifies the tags to apply to a resource when the resource is created for the launch template.\n  ``TagSpecification`` is a property type of [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications). [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications) is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).",
+      "description": "Specifies the tags to apply to resources that are created during instance launch.\n  ``TagSpecification`` is a property type of [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications). [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications) is a property of [AWS::EC2::LaunchTemplate LaunchTemplateData](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html).",
       "additionalProperties": false,
       "type": "object",
       "properties": {
@@ -867,11 +867,12 @@
       }
     },
     "BaselinePerformanceFactors": {
-      "description": "",
+      "description": "The baseline performance to consider, using an instance family as a baseline reference. The instance family establishes the lowest acceptable level of performance. Amazon EC2 uses this baseline to guide instance type selection, but there is no guarantee that the selected instance types will always exceed the baseline for every application.\n Currently, this parameter only supports CPU performance as a baseline performance factor. For example, specifying ``c6i`` would use the CPU performance of the ``c6i`` family as the baseline reference.",
       "additionalProperties": false,
       "type": "object",
       "properties": {
         "Cpu": {
+          "description": "The CPU performance to consider, using an instance family as the baseline reference.",
           "$ref": "#/definitions/Cpu"
         }
       }
@@ -907,7 +908,7 @@
       }
     },
     "InstanceRequirements": {
-      "description": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n You must specify ``VCpuCount`` and ``MemoryMiB``. All other attributes are optional. Any unspecified optional attribute is set to its default.\n When you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n To limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n  +   ``AllowedInstanceTypes`` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n  +   ``ExcludedInstanceTypes`` - The instance types to exclude from the list, even if they match your specified attributes.\n  \n  If you specify ``InstanceRequirements``, you can't specify ``InstanceType``.\n Attribute-based instance type selection is only supported when using Auto Scaling groups, EC2 Fleet, and Spot Fleet to launch instances. If you plan to use the launch template in the [launch instance wizard](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-instance-wizard.html), or with the [RunInstances](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html) API or [AWS::EC2::Instance](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html) AWS CloudFormation resource, you can't specify ``InstanceRequirements``.\n  For more information, see [Attribute-based instance type selection for EC2 Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html), [Attribute-based instance type selection for Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-attribute-based-instance-type-selection.html), and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide*.",
+      "description": "The attributes for the instance types. When you specify instance attributes, Amazon EC2 will identify instance types with these attributes.\n You must specify ``VCpuCount`` and ``MemoryMiB``. All other attributes are optional. Any unspecified optional attribute is set to its default.\n When you specify multiple attributes, you get instance types that satisfy all of the specified attributes. If you specify multiple values for an attribute, you get instance types that satisfy any of the specified values.\n To limit the list of instance types from which Amazon EC2 can identify matching instance types, you can use one of the following parameters, but not both in the same request:\n  +   ``AllowedInstanceTypes`` - The instance types to include in the list. All other instance types are ignored, even if they match your specified attributes.\n  +   ``ExcludedInstanceTypes`` - The instance types to exclude from the list, even if they match your specified attributes.\n  \n  If you specify ``InstanceRequirements``, you can't specify ``InstanceType``.\n Attribute-based instance type selection is only supported when using Auto Scaling groups, EC2 Fleet, and Spot Fleet to launch instances. If you plan to use the launch template in the [launch instance wizard](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-instance-wizard.html), or with the [RunInstances](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html) API or [AWS::EC2::Instance](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html) AWS CloudFormation resource, you can't specify ``InstanceRequirements``.\n  For more information, see [Specify attributes for instance type selection for EC2 Fleet or Spot Fleet](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html) and [Spot placement score](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-placement-score.html) in the *Amazon EC2 User Guide*.",
       "additionalProperties": false,
       "type": "object",
       "properties": {
@@ -925,7 +926,7 @@
         },
         "AcceleratorTypes": {
           "uniqueItems": false,
-          "description": "The accelerator types that must be on the instance type.\n  +  For instance types with GPU accelerators, specify ``gpu``.\n  +  For instance types with FPGA accelerators, specify ``fpga``.\n  +  For instance types with inference accelerators, specify ``inference``.\n  \n Default: Any accelerator type",
+          "description": "The accelerator types that must be on the instance type.\n  +  For instance types with GPU accelerators, specify ``gpu``.\n  +  For instance types with FPGA accelerators, specify ``fpga``.\n  \n Default: Any accelerator type",
           "type": "array",
           "items": {
             "type": "string"
@@ -949,7 +950,7 @@
         },
         "CpuManufacturers": {
           "uniqueItems": false,
-          "description": "The CPU manufacturers to include.\n  +  For instance types with Intel CPUs, specify ``intel``.\n  +  For instance types with AMD CPUs, specify ``amd``.\n  +  For instance types with AWS CPUs, specify ``amazon-web-services``.\n  \n  Don't confuse the CPU manufacturer with the CPU architecture. Instances will be launched with a compatible CPU architecture based on the Amazon Machine Image (AMI) that you specify in your launch template.\n  Default: Any manufacturer",
+          "description": "The CPU manufacturers to include.\n  +  For instance types with Intel CPUs, specify ``intel``.\n  +  For instance types with AMD CPUs, specify ``amd``.\n  +  For instance types with AWS CPUs, specify ``amazon-web-services``.\n  +  For instance types with Apple CPUs, specify ``apple``.\n  \n  Don't confuse the CPU manufacturer with the CPU architecture. Instances will be launched with a compatible CPU architecture based on the Amazon Machine Image (AMI) that you specify in your launch template.\n  Default: Any manufacturer",
           "type": "array",
           "items": {
             "type": "string"
@@ -1013,7 +1014,7 @@
           "$ref": "#/definitions/NetworkBandwidthGbps"
         },
         "BaselinePerformanceFactors": {
-          "description": "",
+          "description": "The baseline performance to consider, using an instance family as a baseline reference. The instance family establishes the lowest acceptable level of performance. Amazon EC2 uses this baseline to guide instance type selection, but there is no guarantee that the selected instance types will always exceed the baseline for every application. Currently, this parameter only supports CPU performance as a baseline performance factor. For more information, see [Performance protection](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-attribute-based-instance-type-selection.html#ec2fleet-abis-performance-protection) in the *Amazon EC2 User Guide*.",
           "$ref": "#/definitions/BaselinePerformanceFactors"
         },
         "SpotMaxPricePercentageOverLowestPrice": {
@@ -1101,7 +1102,7 @@
       "type": "object",
       "properties": {
         "CapacityReservationPreference": {
-          "description": "Indicates the instance's Capacity Reservation preferences. Possible preferences include:\n  +   ``open`` - The instance can run in any ``open`` Capacity Reservation that has matching attributes (instance type, platform, Availability Zone).\n  +   ``none`` - The instance avoids running in a Capacity Reservation even if one is available. The instance runs in On-Demand capacity.",
+          "description": "Indicates the instance's Capacity Reservation preferences. Possible preferences include:\n  +   ``capacity-reservations-only`` - The instance will only run in a Capacity Reservation or Capacity Reservation group. If capacity isn't available, the instance will fail to launch.\n  +   ``open`` - The instance can run in any ``open`` Capacity Reservation that has matching attributes (instance type, platform, Availability Zone, tenancy).\n  +   ``none`` - The instance avoids running in a Capacity Reservation even if one is available. The instance runs in On-Demand capacity.",
           "type": "string"
         },
         "CapacityReservationTarget": {
@@ -1174,7 +1175,7 @@
     },
     "TagSpecifications": {
       "uniqueItems": false,
-      "description": "The tags to apply to the launch template on creation. To tag the launch template, the resource type must be ``launch-template``.\n To specify the tags for the resources that are created when an instance is launched, you must use [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications).",
+      "description": "The tags to apply to the launch template on creation. To tag the launch template, the resource type must be ``launch-template``.\n To specify the tags for resources that are created during instance launch, use [TagSpecifications](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications).",
       "type": "array",
       "items": {
         "$ref": "#/definitions/LaunchTemplateTagSpecification"
diff --git a/internal/aws/cfn/schemas/aws/ec2/networkacl.json b/internal/aws/cfn/schemas/aws/ec2/networkacl.json
index aff7a777..b3602648 100644
--- a/internal/aws/cfn/schemas/aws/ec2/networkacl.json
+++ b/internal/aws/cfn/schemas/aws/ec2/networkacl.json
@@ -1,6 +1,6 @@
 {
   "typeName": "AWS::EC2::NetworkAcl",
-  "description": "Specifies a network ACL for your VPC.",
+  "description": "Specifies a network ACL for your VPC.\n To add a network ACL entry, see [AWS::EC2::NetworkAclEntry](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html).",
   "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ec2.git",
   "additionalProperties": false,
   "definitions": {
diff --git a/internal/aws/cfn/schemas/aws/ec2/volume.json b/internal/aws/cfn/schemas/aws/ec2/volume.json
index 90c1d1b3..f333909c 100644
--- a/internal/aws/cfn/schemas/aws/ec2/volume.json
+++ b/internal/aws/cfn/schemas/aws/ec2/volume.json
@@ -1,101 +1,25 @@
 {
-  "typeName": "AWS::EC2::Volume",
-  "description": "Specifies an Amazon Elastic Block Store (Amazon EBS) volume.\n When you use CFNlong to update an Amazon EBS volume that modifies ``Iops``, ``Size``, or ``VolumeType``, there is a cooldown period before another operation can occur. This can cause your stack to report being in ``UPDATE_IN_PROGRESS`` or ``UPDATE_ROLLBACK_IN_PROGRESS`` for long periods of time.\n Amazon EBS does not support sizing down an Amazon EBS volume. CFNlong does not attempt to modify an Amazon EBS volume to a smaller size on rollback.\n Some common scenarios when you might encounter a cooldown period for Amazon EBS include:\n  +  You successfully update an Amazon EBS volume and the update succeeds. When you attempt another update within the cooldown window, that update will be subject to a cooldown period.\n  +  You successfully update an Amazon EBS volume and the update succeeds but another change in your ``update-stack`` call fails. The rollback will be subject to a cooldown period.\n  \n For more information, see [Requirements for EBS volume modifications](https://docs.aws.amazon.com/ebs/latest/userguide/modify-volume-requirements.html).\n  *DeletionPolicy attribute* \n To control how CFNlong handles the volume when the stack is deleted, set a deletion policy for your volume. You can choose to retain the volume, to delete the volume, or to create a snapshot of the volume. For more information, see [DeletionPolicy attribute](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html).\n  If you set a deletion policy that creates a snapshot, all tags on the volume are included in the snapshot.",
   "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ec2.git",
-  "additionalProperties": false,
-  "properties": {
-    "MultiAttachEnabled": {
-      "type": "boolean",
-      "description": "Indicates whether Amazon EBS Multi-Attach is enabled.\n  CFNlong does not currently support updating a single-attach volume to be multi-attach enabled, updating a multi-attach enabled volume to be single-attach, or updating the size or number of I/O operations per second (IOPS) of a multi-attach enabled volume."
-    },
-    "KmsKeyId": {
-      "type": "string",
-      "description": "The identifier of the kms-key-long to use for Amazon EBS encryption. If ``KmsKeyId`` is specified, the encrypted state must be ``true``.\n If you omit this property and your account is enabled for encryption by default, or *Encrypted* is set to ``true``, then the volume is encrypted using the default key specified for your account. If your account does not have a default key, then the volume is encrypted using the aws-managed-key.\n Alternatively, if you want to specify a different key, you can specify one of the following:\n  +  Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.\n  +  Key alias. Specify the alias for the key, prefixed with ``alias/``. For example, for a key with the alias ``my_cmk``, use ``alias/my_cmk``. Or to specify the aws-managed-key, use ``alias/aws/ebs``.\n  +  Key ARN. For example, arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.\n  +  Alias ARN. For example, arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias."
-    },
-    "Encrypted": {
-      "type": "boolean",
-      "description": "Indicates whether the volume should be encrypted. The effect of setting the encryption state to ``true`` depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see [Encryption by default](https://docs.aws.amazon.com/ebs/latest/userguide/work-with-ebs-encr.html#encryption-by-default) in the *Amazon EBS User Guide*.\n Encrypted Amazon EBS volumes must be attached to instances that support Amazon EBS encryption. For more information, see [Supported instance types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption-requirements.html#ebs-encryption_supported_instances)."
-    },
-    "Size": {
-      "type": "integer",
-      "description": "The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.\n The following are the supported volumes sizes for each volume type:\n  +   ``gp2`` and ``gp3``: 1 - 16,384 GiB\n  +   ``io1``: 4 - 16,384 GiB\n  +   ``io2``: 4 - 65,536 GiB\n  +   ``st1`` and ``sc1``: 125 - 16,384 GiB\n  +   ``standard``: 1 - 1024 GiB"
-    },
-    "AutoEnableIO": {
-      "type": "boolean",
-      "description": "Indicates whether the volume is auto-enabled for I/O operations. By default, Amazon EBS disables I/O to the volume from attached EC2 instances when it determines that a volume's data is potentially inconsistent. If the consistency of the volume is not a concern, and you prefer that the volume be made available immediately if it's impaired, you can configure the volume to automatically enable I/O."
-    },
-    "OutpostArn": {
-      "type": "string",
-      "description": "The Amazon Resource Name (ARN) of the Outpost."
-    },
-    "AvailabilityZone": {
-      "type": "string",
-      "description": "The ID of the Availability Zone in which to create the volume. For example, ``us-east-1a``."
-    },
-    "Throughput": {
-      "type": "integer",
-      "description": "The throughput to provision for a volume, with a maximum of 1,000 MiB/s.\n This parameter is valid only for ``gp3`` volumes. The default value is 125.\n Valid Range: Minimum value of 125. Maximum value of 1000."
-    },
-    "Iops": {
-      "type": "integer",
-      "description": "The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.\n The following are the supported values for each volume type:\n  +   ``gp3``: 3,000 - 16,000 IOPS\n  +   ``io1``: 100 - 64,000 IOPS\n  +   ``io2``: 100 - 256,000 IOPS\n  \n For ``io2`` volumes, you can achieve up to 256,000 IOPS on [instances built on the Nitro System](https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html). On other instances, you can achieve performance up to 32,000 IOPS.\n This parameter is required for ``io1`` and ``io2`` volumes. The default for ``gp3`` volumes is 3,000 IOPS. This parameter is not supported for ``gp2``, ``st1``, ``sc1``, or ``standard`` volumes."
-    },
-    "SnapshotId": {
-      "type": "string",
-      "description": "The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size."
-    },
-    "VolumeType": {
-      "type": "string",
-      "description": "The volume type. This parameter can be one of the following values:\n  +  General Purpose SSD: ``gp2`` | ``gp3`` \n  +  Provisioned IOPS SSD: ``io1`` | ``io2`` \n  +  Throughput Optimized HDD: ``st1`` \n  +  Cold HDD: ``sc1`` \n  +  Magnetic: ``standard`` \n  \n For more information, see [Amazon EBS volume types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html).\n Default: ``gp2``"
-    },
-    "VolumeId": {
-      "type": "string",
-      "description": ""
-    },
-    "Tags": {
-      "type": "array",
-      "uniqueItems": false,
-      "description": "The tags to apply to the volume during creation.",
-      "insertionOrder": false,
-      "items": {
-        "$ref": "#/definitions/Tag"
-      }
-    }
-  },
-  "definitions": {
-    "Tag": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "Key": {
-          "description": "The tag key.",
-          "type": "string"
-        },
-        "Value": {
-          "description": "The tag value.",
-          "type": "string"
-        }
-      },
-      "required": [
-        "Value",
-        "Key"
-      ],
-      "description": "Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html)."
-    }
-  },
   "tagging": {
-    "taggable": true,
-    "tagOnCreate": true,
-    "tagUpdatable": true,
-    "cloudFormationSystemTags": false,
-    "tagProperty": "/properties/Tags",
     "permissions": [
       "ec2:CreateTags",
       "ec2:DeleteTags",
       "ec2:DescribeTags"
-    ]
+    ],
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "tagProperty": "/properties/Tags",
+    "cloudFormationSystemTags": false
   },
   "handlers": {
+    "read": {
+      "permissions": [
+        "ec2:DescribeVolumes",
+        "ec2:DescribeVolumeAttribute",
+        "ec2:DescribeTags"
+      ]
+    },
     "create": {
       "permissions": [
         "ec2:CreateVolume",
@@ -108,13 +32,6 @@
       ],
       "timeoutInMinutes": 725
     },
-    "read": {
-      "permissions": [
-        "ec2:DescribeVolumes",
-        "ec2:DescribeVolumeAttribute",
-        "ec2:DescribeTags"
-      ]
-    },
     "update": {
       "permissions": [
         "ec2:ModifyVolume",
@@ -127,6 +44,13 @@
       ],
       "timeoutInMinutes": 2160
     },
+    "list": {
+      "permissions": [
+        "ec2:DescribeVolumes",
+        "ec2:DescribeTags",
+        "ec2:DescribeVolumeAttribute"
+      ]
+    },
     "delete": {
       "permissions": [
         "ec2:DeleteVolume",
@@ -135,22 +59,98 @@
         "ec2:DeleteTags",
         "ec2:DescribeVolumes"
       ]
-    },
-    "list": {
-      "permissions": [
-        "ec2:DescribeVolumes",
-        "ec2:DescribeTags",
-        "ec2:DescribeVolumeAttribute"
-      ]
     }
   },
-  "required": [
-    "AvailabilityZone"
+  "typeName": "AWS::EC2::Volume",
+  "readOnlyProperties": [
+    "/properties/VolumeId"
   ],
+  "description": "Specifies an Amazon Elastic Block Store (Amazon EBS) volume.\n When you use CFNlong to update an Amazon EBS volume that modifies ``Iops``, ``Size``, or ``VolumeType``, there is a cooldown period before another operation can occur. This can cause your stack to report being in ``UPDATE_IN_PROGRESS`` or ``UPDATE_ROLLBACK_IN_PROGRESS`` for long periods of time.\n Amazon EBS does not support sizing down an Amazon EBS volume. CFNlong does not attempt to modify an Amazon EBS volume to a smaller size on rollback.\n Some common scenarios when you might encounter a cooldown period for Amazon EBS include:\n  +  You successfully update an Amazon EBS volume and the update succeeds. When you attempt another update within the cooldown window, that update will be subject to a cooldown period.\n  +  You successfully update an Amazon EBS volume and the update succeeds but another change in your ``update-stack`` call fails. The rollback will be subject to a cooldown period.\n  \n For more information, see [Requirements for EBS volume modifications](https://docs.aws.amazon.com/ebs/latest/userguide/modify-volume-requirements.html).\n  *DeletionPolicy attribute* \n To control how CFNlong handles the volume when the stack is deleted, set a deletion policy for your volume. You can choose to retain the volume, to delete the volume, or to create a snapshot of the volume. For more information, see [DeletionPolicy attribute](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html).\n  If you set a deletion policy that creates a snapshot, all tags on the volume are included in the snapshot.",
+  "additionalProperties": false,
   "primaryIdentifier": [
     "/properties/VolumeId"
   ],
-  "readOnlyProperties": [
-    "/properties/VolumeId"
+  "definitions": {
+    "Tag": {
+      "description": "Specifies a tag. For more information, see [Resource tags](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html).",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+        "Value": {
+          "description": "The tag value.",
+          "type": "string"
+        },
+        "Key": {
+          "description": "The tag key.",
+          "type": "string"
+        }
+      },
+      "required": [
+        "Value",
+        "Key"
+      ]
+    }
+  },
+  "properties": {
+    "MultiAttachEnabled": {
+      "description": "Indicates whether Amazon EBS Multi-Attach is enabled.\n  CFNlong does not currently support updating a single-attach volume to be multi-attach enabled, updating a multi-attach enabled volume to be single-attach, or updating the size or number of I/O operations per second (IOPS) of a multi-attach enabled volume.",
+      "type": "boolean"
+    },
+    "KmsKeyId": {
+      "description": "The identifier of the kms-key-long to use for Amazon EBS encryption. If ``KmsKeyId`` is specified, the encrypted state must be ``true``.\n If you omit this property and your account is enabled for encryption by default, or *Encrypted* is set to ``true``, then the volume is encrypted using the default key specified for your account. If your account does not have a default key, then the volume is encrypted using the aws-managed-key.\n Alternatively, if you want to specify a different key, you can specify one of the following:\n  +  Key ID. For example, 1234abcd-12ab-34cd-56ef-1234567890ab.\n  +  Key alias. Specify the alias for the key, prefixed with ``alias/``. For example, for a key with the alias ``my_cmk``, use ``alias/my_cmk``. Or to specify the aws-managed-key, use ``alias/aws/ebs``.\n  +  Key ARN. For example, arn:aws:kms:us-east-1:012345678910:key/1234abcd-12ab-34cd-56ef-1234567890ab.\n  +  Alias ARN. For example, arn:aws:kms:us-east-1:012345678910:alias/ExampleAlias.",
+      "type": "string"
+    },
+    "Encrypted": {
+      "description": "Indicates whether the volume should be encrypted. The effect of setting the encryption state to ``true`` depends on the volume origin (new or from a snapshot), starting encryption state, ownership, and whether encryption by default is enabled. For more information, see [Encryption by default](https://docs.aws.amazon.com/ebs/latest/userguide/work-with-ebs-encr.html#encryption-by-default) in the *Amazon EBS User Guide*.\n Encrypted Amazon EBS volumes must be attached to instances that support Amazon EBS encryption. For more information, see [Supported instance types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption-requirements.html#ebs-encryption_supported_instances).",
+      "type": "boolean"
+    },
+    "Size": {
+      "description": "The size of the volume, in GiBs. You must specify either a snapshot ID or a volume size. If you specify a snapshot, the default is the snapshot size. You can specify a volume size that is equal to or larger than the snapshot size.\n The following are the supported volumes sizes for each volume type:\n  +   ``gp2`` and ``gp3``: 1 - 16,384 GiB\n  +   ``io1``: 4 - 16,384 GiB\n  +   ``io2``: 4 - 65,536 GiB\n  +   ``st1`` and ``sc1``: 125 - 16,384 GiB\n  +   ``standard``: 1 - 1024 GiB",
+      "type": "integer"
+    },
+    "AutoEnableIO": {
+      "description": "Indicates whether the volume is auto-enabled for I/O operations. By default, Amazon EBS disables I/O to the volume from attached EC2 instances when it determines that a volume's data is potentially inconsistent. If the consistency of the volume is not a concern, and you prefer that the volume be made available immediately if it's impaired, you can configure the volume to automatically enable I/O.",
+      "type": "boolean"
+    },
+    "OutpostArn": {
+      "description": "The Amazon Resource Name (ARN) of the Outpost.",
+      "type": "string"
+    },
+    "AvailabilityZone": {
+      "description": "The ID of the Availability Zone in which to create the volume. For example, ``us-east-1a``.",
+      "type": "string"
+    },
+    "Throughput": {
+      "description": "The throughput to provision for a volume, with a maximum of 1,000 MiB/s.\n This parameter is valid only for ``gp3`` volumes. The default value is 125.\n Valid Range: Minimum value of 125. Maximum value of 1000.",
+      "type": "integer"
+    },
+    "Iops": {
+      "description": "The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.\n The following are the supported values for each volume type:\n  +   ``gp3``: 3,000 - 16,000 IOPS\n  +   ``io1``: 100 - 64,000 IOPS\n  +   ``io2``: 100 - 256,000 IOPS\n  \n For ``io2`` volumes, you can achieve up to 256,000 IOPS on [instances built on the Nitro System](https://docs.aws.amazon.com/ec2/latest/instancetypes/ec2-nitro-instances.html). On other instances, you can achieve performance up to 32,000 IOPS.\n This parameter is required for ``io1`` and ``io2`` volumes. The default for ``gp3`` volumes is 3,000 IOPS. This parameter is not supported for ``gp2``, ``st1``, ``sc1``, or ``standard`` volumes.",
+      "type": "integer"
+    },
+    "SnapshotId": {
+      "description": "The snapshot from which to create the volume. You must specify either a snapshot ID or a volume size.",
+      "type": "string"
+    },
+    "VolumeId": {
+      "description": "",
+      "type": "string"
+    },
+    "VolumeType": {
+      "description": "The volume type. This parameter can be one of the following values:\n  +  General Purpose SSD: ``gp2`` | ``gp3`` \n  +  Provisioned IOPS SSD: ``io1`` | ``io2`` \n  +  Throughput Optimized HDD: ``st1`` \n  +  Cold HDD: ``sc1`` \n  +  Magnetic: ``standard`` \n  \n For more information, see [Amazon EBS volume types](https://docs.aws.amazon.com/ebs/latest/userguide/ebs-volume-types.html).\n Default: ``gp2``",
+      "type": "string"
+    },
+    "Tags": {
+      "uniqueItems": false,
+      "description": "The tags to apply to the volume during creation.",
+      "insertionOrder": false,
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Tag"
+      }
+    }
+  },
+  "required": [
+    "AvailabilityZone"
   ]
 }
diff --git a/internal/aws/cfn/schemas/aws/ec2/vpccidrblock.json b/internal/aws/cfn/schemas/aws/ec2/vpccidrblock.json
index cf275124..9629276f 100644
--- a/internal/aws/cfn/schemas/aws/ec2/vpccidrblock.json
+++ b/internal/aws/cfn/schemas/aws/ec2/vpccidrblock.json
@@ -50,6 +50,10 @@
     "IpSource": {
       "type": "string",
       "description": "The IP Source of an IPv6 VPC CIDR Block."
+    },
+    "Ipv6CidrBlockNetworkBorderGroup": {
+      "type": "string",
+      "description": "The name of the location from which we advertise the IPV6 CIDR block."
     }
   },
   "tagging": {
@@ -67,7 +71,8 @@
     "/properties/Ipv4IpamPoolId",
     "/properties/Ipv4NetmaskLength",
     "/properties/Ipv6IpamPoolId",
-    "/properties/Ipv6NetmaskLength"
+    "/properties/Ipv6NetmaskLength",
+    "/properties/Ipv6CidrBlockNetworkBorderGroup"
   ],
   "primaryIdentifier": [
     "/properties/Id",
diff --git a/internal/aws/cfn/schemas/aws/ec2/vpcendpoint.json b/internal/aws/cfn/schemas/aws/ec2/vpcendpoint.json
index 02d879ca..2deefb4b 100644
--- a/internal/aws/cfn/schemas/aws/ec2/vpcendpoint.json
+++ b/internal/aws/cfn/schemas/aws/ec2/vpcendpoint.json
@@ -27,6 +27,23 @@
         }
       },
       "description": ""
+    },
+    "Tag": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "Key": {
+          "type": "string"
+        },
+        "Value": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "Value",
+        "Key"
+      ],
+      "description": ""
     }
   },
   "properties": {
@@ -166,6 +183,15 @@
     "DnsOptions": {
       "$ref": "#/definitions/DnsOptionsSpecification",
       "description": ""
+    },
+    "Tags": {
+      "type": "array",
+      "description": "",
+      "uniqueItems": false,
+      "insertionOrder": false,
+      "items": {
+        "$ref": "#/definitions/Tag"
+      }
     }
   },
   "required": [
@@ -188,10 +214,16 @@
     "/properties/Id"
   ],
   "tagging": {
-    "taggable": false,
-    "tagOnCreate": false,
-    "tagUpdatable": false,
-    "cloudFormationSystemTags": false
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "cloudFormationSystemTags": false,
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "ec2:CreateTags",
+      "ec2:DeleteTags",
+      "ec2:DescribeVpcEndpoints"
+    ]
   },
   "handlers": {
     "create": {
@@ -201,7 +233,9 @@
         "ec2:DescribeSubnets",
         "ec2:DescribeSecurityGroups",
         "vpc-lattice:CreateServiceNetworkVpcEndpointAssociation",
-        "vpc-lattice:DescribeServiceNetworkVpcEndpointAssociation"
+        "vpc-lattice:DescribeServiceNetworkVpcEndpointAssociation",
+        "ec2:CreateTags",
+        "ec2:DeleteTags"
       ],
       "timeoutInMinutes": 210
     },
@@ -220,7 +254,9 @@
         "ec2:DescribeSubnets",
         "ec2:DescribeSecurityGroups",
         "vpc-lattice:CreateServiceNetworkVpcEndpointAssociation",
-        "vpc-lattice:DescribeServiceNetworkVpcEndpointAssociation"
+        "vpc-lattice:DescribeServiceNetworkVpcEndpointAssociation",
+        "ec2:CreateTags",
+        "ec2:DeleteTags"
       ],
       "timeoutInMinutes": 210
     },
@@ -230,7 +266,9 @@
         "ec2:DescribeVpcEndpoints",
         "ec2:DescribeSubnets",
         "ec2:DescribeSecurityGroups",
-        "vpc-lattice:DescribeServiceNetworkVpcEndpointAssociation"
+        "vpc-lattice:DescribeServiceNetworkVpcEndpointAssociation",
+        "ec2:CreateTags",
+        "ec2:DeleteTags"
       ],
       "timeoutInMinutes": 210
     },
diff --git a/internal/aws/cfn/schemas/aws/ec2/vpcendpointservice.json b/internal/aws/cfn/schemas/aws/ec2/vpcendpointservice.json
index d2d54380..ec3d7e14 100644
--- a/internal/aws/cfn/schemas/aws/ec2/vpcendpointservice.json
+++ b/internal/aws/cfn/schemas/aws/ec2/vpcendpointservice.json
@@ -2,6 +2,24 @@
   "typeName": "AWS::EC2::VPCEndpointService",
   "description": "Resource Type definition for AWS::EC2::VPCEndpointService",
   "additionalProperties": false,
+  "definitions": {
+    "Tag": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "Value": {
+          "type": "string"
+        },
+        "Key": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "Value",
+        "Key"
+      ]
+    }
+  },
   "properties": {
     "NetworkLoadBalancerArns": {
       "type": "array",
@@ -32,6 +50,15 @@
       "items": {
         "type": "string"
       }
+    },
+    "Tags": {
+      "type": "array",
+      "description": "The tags to add to the VPC endpoint service.",
+      "uniqueItems": false,
+      "insertionOrder": false,
+      "items": {
+        "$ref": "#/definitions/Tag"
+      }
     }
   },
   "primaryIdentifier": [
@@ -44,32 +71,38 @@
     "/properties/ContributorInsightsEnabled"
   ],
   "tagging": {
-    "taggable": false,
-    "tagOnCreate": false,
-    "tagUpdatable": false,
-    "cloudFormationSystemTags": false
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "cloudFormationSystemTags": false,
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "ec2:CreateTags",
+      "ec2:DeleteTags"
+    ]
   },
   "handlers": {
     "create": {
       "permissions": [
         "ec2:CreateVpcEndpointServiceConfiguration",
-        "ec2:ModifyVpcEndpointServiceConfiguration",
         "ec2:ModifyVpcEndpointServicePayerResponsibility",
         "cloudwatch:ListManagedInsightRules",
         "cloudwatch:DeleteInsightRules",
         "cloudwatch:PutManagedInsightRules",
-        "ec2:DescribeVpcEndpointServiceConfigurations"
+        "ec2:DescribeVpcEndpointServiceConfigurations",
+        "ec2:CreateTags"
       ]
     },
     "update": {
       "permissions": [
         "ec2:ModifyVpcEndpointServiceConfiguration",
-        "ec2:DeleteVpcEndpointServiceConfigurations",
         "ec2:DescribeVpcEndpointServiceConfigurations",
         "ec2:ModifyVpcEndpointServicePayerResponsibility",
         "cloudwatch:ListManagedInsightRules",
         "cloudwatch:DeleteInsightRules",
-        "cloudwatch:PutManagedInsightRules"
+        "cloudwatch:PutManagedInsightRules",
+        "ec2:CreateTags",
+        "ec2:DeleteTags"
       ]
     },
     "read": {
@@ -83,7 +116,8 @@
         "ec2:DeleteVpcEndpointServiceConfigurations",
         "ec2:DescribeVpcEndpointServiceConfigurations",
         "cloudwatch:ListManagedInsightRules",
-        "cloudwatch:DeleteInsightRules"
+        "cloudwatch:DeleteInsightRules",
+        "ec2:DeleteTags"
       ]
     },
     "list": {
diff --git a/internal/aws/cfn/schemas/aws/ecs/service.json b/internal/aws/cfn/schemas/aws/ecs/service.json
index dfafa628..f72f2bf1 100644
--- a/internal/aws/cfn/schemas/aws/ecs/service.json
+++ b/internal/aws/cfn/schemas/aws/ecs/service.json
@@ -307,7 +307,7 @@
               "type": "string"
             }
           },
-          "description": "The configuration options to send to the log driver.\n The options you can specify depend on the log driver. Some of the options you can specify when you use the ``awslogs`` log driver to route logs to Amazon CloudWatch include the following:\n  + awslogs-create-group Required: No Specify whether you want the log group to be created automatically. If this option isn't specified, it defaults to false. Your IAM policy must include the logs:CreateLogGroup permission before you attempt to use awslogs-create-group. + awslogs-region Required: Yes Specify the Region that the awslogs log driver is to send your Docker logs to. You can choose to send all of your logs from clusters in different Regions to a single region in CloudWatch Logs. This is so that they're all visible in one location. Otherwise, you can separate them by Region for more granularity. Make sure that the specified log group exists in the Region that you specify with this option. + awslogs-group Required: Yes Make sure to specify a log group that the awslogs log driver sends its log streams to. + awslogs-stream-prefix Required: Yes, when using the Fargate launch type.Optional for the EC2 launch type, required for the Fargate launch type. Use the awslogs-stream-prefix option to associate a log stream with the specified prefix, the container name, and the ID of the Amazon ECS task that the container belongs to. If you specify a prefix with this option, then the log stream takes the format prefix-name/container-name/ecs-task-id. If you don't specify a prefix with this option, then the log stream is named after the container ID that's assigned by the Docker daemon on the container instance. Because it's difficult to trace logs back to the container that sent them with just the Docker container ID (which is only available on the container instance), we recommend that you specify a prefix with this option. For Amazon ECS services, you can use the service name as the prefix. Doing so, you can trace log streams to the service that the container belongs to, the name of the container that sent them, and the ID of the task that the container belongs to. You must specify a stream-prefix for your logs to have your logs appear in the Log pane when using the Amazon ECS console. + awslogs-datetime-format Required: No This option defines a multiline start pattern in Python strftime format. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. One example of a use case for using this format is for parsing output such as a stack dump, which might otherwise be logged in multiple entries. The correct pattern allows it to be captured in a single entry. For more information, see awslogs-datetime-format. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + awslogs-multiline-pattern Required: No This option defines a multiline start pattern that uses a regular expression. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. For more information, see awslogs-multiline-pattern. This option is ignored if awslogs-datetime-format is also configured. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + mode Required: No Valid values: non-blocking | blocking This option defines the delivery mode of log messages from the container to CloudWatch Logs. The delivery mode you choose affects application availability when the flow of logs from container to CloudWatch is interrupted. If you use the blocking mode and the flow of logs to CloudWatch is interrupted, calls from container code to write to the stdout and stderr streams will block. The logging thread of the application will block as a result. This may cause the application to become unresponsive and lead to container healthcheck failure. If you use the non-blocking mode, the container's logs are instead stored in an in-memory intermediate buffer configured with the max-buffer-size option. This prevents the application from becoming unresponsive when logs cannot be sent to CloudWatch. We recommend using this mode if you want to ensure service availability and are okay with some log loss. For more information, see Preventing log loss with non-blocking mode in the awslogs container log driver. + max-buffer-size Required: No Default value: 1m When non-blocking mode is used, the max-buffer-size log option controls the size of the buffer that's used for intermediate message storage. Make sure to specify an adequate buffer size based on your application. When the buffer fills up, further logs cannot be stored. Logs that cannot be stored are lost. \n To route logs using the ``splunk`` log router, you need to specify a ``splunk-token`` and a ``splunk-url``.\n When you use the ``awsfirelens`` log router to route logs to an AWS Service or AWS Partner Network destination for log storage and analytics, you can set the ``log-driver-buffer-limit`` option to limit the number of events that are buffered in memory, before being sent to the log router container. It can help to resolve potential log loss issue because high throughput might result in memory running out for the buffer inside of Docker.\n Other options you can specify when using ``awsfirelens`` to route logs depend on the destination. When you export logs to Amazon Data Firehose, you can specify the AWS Region with ``region`` and a name for the log stream with ``delivery_stream``.\n When you export logs to Amazon Kinesis Data Streams, you can specify an AWS Region with ``region`` and a data stream name with ``stream``.\n  When you export logs to Amazon OpenSearch Service, you can specify options like ``Name``, ``Host`` (OpenSearch Service endpoint without protocol), ``Port``, ``Index``, ``Type``, ``Aws_auth``, ``Aws_region``, ``Suppress_Type_Name``, and ``tls``.\n When you export logs to Amazon S3, you can specify the bucket using the ``bucket`` option. You can also specify ``region``, ``total_file_size``, ``upload_timeout``, and ``use_put_object`` as options.\n This parameter requires version 1.19 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version --format '{{.Server.APIVersion}}'``",
+          "description": "The configuration options to send to the log driver.\n The options you can specify depend on the log driver. Some of the options you can specify when you use the ``awslogs`` log driver to route logs to Amazon CloudWatch include the following:\n  + awslogs-create-group Required: No Specify whether you want the log group to be created automatically. If this option isn't specified, it defaults to false. Your IAM policy must include the logs:CreateLogGroup permission before you attempt to use awslogs-create-group. + awslogs-region Required: Yes Specify the Region that the awslogs log driver is to send your Docker logs to. You can choose to send all of your logs from clusters in different Regions to a single region in CloudWatch Logs. This is so that they're all visible in one location. Otherwise, you can separate them by Region for more granularity. Make sure that the specified log group exists in the Region that you specify with this option. + awslogs-group Required: Yes Make sure to specify a log group that the awslogs log driver sends its log streams to. + awslogs-stream-prefix Required: Yes, when using the Fargate launch type.Optional for the EC2 launch type, required for the Fargate launch type. Use the awslogs-stream-prefix option to associate a log stream with the specified prefix, the container name, and the ID of the Amazon ECS task that the container belongs to. If you specify a prefix with this option, then the log stream takes the format prefix-name/container-name/ecs-task-id. If you don't specify a prefix with this option, then the log stream is named after the container ID that's assigned by the Docker daemon on the container instance. Because it's difficult to trace logs back to the container that sent them with just the Docker container ID (which is only available on the container instance), we recommend that you specify a prefix with this option. For Amazon ECS services, you can use the service name as the prefix. Doing so, you can trace log streams to the service that the container belongs to, the name of the container that sent them, and the ID of the task that the container belongs to. You must specify a stream-prefix for your logs to have your logs appear in the Log pane when using the Amazon ECS console. + awslogs-datetime-format Required: No This option defines a multiline start pattern in Python strftime format. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. One example of a use case for using this format is for parsing output such as a stack dump, which might otherwise be logged in multiple entries. The correct pattern allows it to be captured in a single entry. For more information, see awslogs-datetime-format. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + awslogs-multiline-pattern Required: No This option defines a multiline start pattern that uses a regular expression. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. For more information, see awslogs-multiline-pattern. This option is ignored if awslogs-datetime-format is also configured. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + mode Required: No Valid values: non-blocking | blocking This option defines the delivery mode of log messages from the container to CloudWatch Logs. The delivery mode you choose affects application availability when the flow of logs from container to CloudWatch is interrupted. If you use the blocking mode and the flow of logs to CloudWatch is interrupted, calls from container code to write to the stdout and stderr streams will block. The logging thread of the application will block as a result. This may cause the application to become unresponsive and lead to container healthcheck failure. If you use the non-blocking mode, the container's logs are instead stored in an in-memory intermediate buffer configured with the max-buffer-size option. This prevents the application from becoming unresponsive when logs cannot be sent to CloudWatch. We recommend using this mode if you want to ensure service availability and are okay with some log loss. For more information, see Preventing log loss with non-blocking mode in the awslogs container log driver. + max-buffer-size Required: No Default value: 1m When non-blocking mode is used, the max-buffer-size log option controls the size of the buffer that's used for intermediate message storage. Make sure to specify an adequate buffer size based on your application. When the buffer fills up, further logs cannot be stored. Logs that cannot be stored are lost. \n To route logs using the ``splunk`` log router, you need to specify a ``splunk-token`` and a ``splunk-url``.\n When you use the ``awsfirelens`` log router to route logs to an AWS Service or AWS Partner Network destination for log storage and analytics, you can set the ``log-driver-buffer-limit`` option to limit the number of events that are buffered in memory, before being sent to the log router container. It can help to resolve potential log loss issue because high throughput might result in memory running out for the buffer inside of Docker.\n Other options you can specify when using ``awsfirelens`` to route logs depend on the destination. When you export logs to Amazon Data Firehose, you can specify the AWS Region with ``region`` and a name for the log stream with ``delivery_stream``.\n When you export logs to Amazon Kinesis Data Streams, you can specify an AWS Region with ``region`` and a data stream name with ``stream``.\n  When you export logs to Amazon OpenSearch Service, you can specify options like ``Name``, ``Host`` (OpenSearch Service endpoint without protocol), ``Port``, ``Index``, ``Type``, ``Aws_auth``, ``Aws_region``, ``Suppress_Type_Name``, and ``tls``. For more information, see [Under the hood: FireLens for Amazon ECS Tasks](https://docs.aws.amazon.com/containers/under-the-hood-firelens-for-amazon-ecs-tasks/).\n When you export logs to Amazon S3, you can specify the bucket using the ``bucket`` option. You can also specify ``region``, ``total_file_size``, ``upload_timeout``, and ``use_put_object`` as options.\n This parameter requires version 1.19 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version --format '{{.Server.APIVersion}}'``",
           "additionalProperties": false,
           "type": "object"
         },
@@ -426,6 +426,10 @@
           "description": "The throughput to provision for a volume, in MiB/s, with a maximum of 1,000 MiB/s. This parameter maps 1:1 with the ``Throughput`` parameter of the [CreateVolume API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateVolume.html) in the *Amazon EC2 API Reference*.\n  This parameter is only supported for the ``gp3`` volume type.",
           "type": "integer"
         },
+        "VolumeInitializationRate": {
+          "description": "",
+          "type": "integer"
+        },
         "Iops": {
           "description": "The number of I/O operations per second (IOPS). For ``gp3``, ``io1``, and ``io2`` volumes, this represents the number of IOPS that are provisioned for the volume. For ``gp2`` volumes, this represents the baseline performance of the volume and the rate at which the volume accumulates I/O credits for bursting.\n The following are the supported values for each volume type.\n  +   ``gp3``: 3,000 - 16,000 IOPS\n  +   ``io1``: 100 - 64,000 IOPS\n  +   ``io2``: 100 - 256,000 IOPS\n  \n This parameter is required for ``io1`` and ``io2`` volume types. The default for ``gp3`` volumes is ``3,000 IOPS``. This parameter is not supported for ``st1``, ``sc1``, or ``standard`` volume types.\n This parameter maps 1:1 with the ``Iops`` parameter of the [CreateVolume API](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateVolume.html) in the *Amazon EC2 API Reference*.",
           "type": "integer"
@@ -558,11 +562,11 @@
           "$ref": "#/definitions/DeploymentCircuitBreaker"
         },
         "MaximumPercent": {
-          "description": "If a service is using the rolling update (``ECS``) deployment type, the ``maximumPercent`` parameter represents an upper limit on the number of your service's tasks that are allowed in the ``RUNNING`` or ``PENDING`` state during a deployment, as a percentage of the ``desiredCount`` (rounded down to the nearest integer). This parameter enables you to define the deployment batch size. For example, if your service is using the ``REPLICA`` service scheduler and has a ``desiredCount`` of four tasks and a ``maximumPercent`` value of 200%, the scheduler may start four new tasks before stopping the four older tasks (provided that the cluster resources required to do this are available). The default ``maximumPercent`` value for a service using the ``REPLICA`` service scheduler is 200%.\n If a service is using either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types, and tasks in the service use the EC2 launch type, the *maximum percent* value is set to the default value. The *maximum percent* value is used to define the upper limit on the number of the tasks in the service that remain in the ``RUNNING`` state while the container instances are in the ``DRAINING`` state.\n  You can't specify a custom ``maximumPercent`` value for a service that uses either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types and has tasks that use the EC2 launch type.\n  If the tasks in the service use the Fargate launch type, the maximum percent value is not used, although it is returned when describing your service.",
+          "description": "If a service is using the rolling update (``ECS``) deployment type, the ``maximumPercent`` parameter represents an upper limit on the number of your service's tasks that are allowed in the ``RUNNING`` or ``PENDING`` state during a deployment, as a percentage of the ``desiredCount`` (rounded down to the nearest integer). This parameter enables you to define the deployment batch size. For example, if your service is using the ``REPLICA`` service scheduler and has a ``desiredCount`` of four tasks and a ``maximumPercent`` value of 200%, the scheduler may start four new tasks before stopping the four older tasks (provided that the cluster resources required to do this are available). The default ``maximumPercent`` value for a service using the ``REPLICA`` service scheduler is 200%.\n The Amazon ECS scheduler uses this parameter to replace unhealthy tasks by starting replacement tasks first and then stopping the unhealthy tasks, as long as cluster resources for starting replacement tasks are available. For more information about how the scheduler replaces unhealthy tasks, see [Amazon ECS services](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html).\n If a service is using either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types, and tasks in the service use the EC2 launch type, the *maximum percent* value is set to the default value. The *maximum percent* value is used to define the upper limit on the number of the tasks in the service that remain in the ``RUNNING`` state while the container instances are in the ``DRAINING`` state.\n  You can't specify a custom ``maximumPercent`` value for a service that uses either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types and has tasks that use the EC2 launch type.\n  If the service uses either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types, and the tasks in the service use the Fargate launch type, the maximum percent value is not used. The value is still returned when describing your service.",
           "type": "integer"
         },
         "MinimumHealthyPercent": {
-          "description": "If a service is using the rolling update (``ECS``) deployment type, the ``minimumHealthyPercent`` represents a lower limit on the number of your service's tasks that must remain in the ``RUNNING`` state during a deployment, as a percentage of the ``desiredCount`` (rounded up to the nearest integer). This parameter enables you to deploy without using additional cluster capacity. For example, if your service has a ``desiredCount`` of four tasks and a ``minimumHealthyPercent`` of 50%, the service scheduler may stop two existing tasks to free up cluster capacity before starting two new tasks. \n For services that *do not* use a load balancer, the following should be noted:\n  +  A service is considered healthy if all essential containers within the tasks in the service pass their health checks.\n  +  If a task has no essential containers with a health check defined, the service scheduler will wait for 40 seconds after a task reaches a ``RUNNING`` state before the task is counted towards the minimum healthy percent total.\n  +  If a task has one or more essential containers with a health check defined, the service scheduler will wait for the task to reach a healthy status before counting it towards the minimum healthy percent total. A task is considered healthy when all essential containers within the task have passed their health checks. The amount of time the service scheduler can wait for is determined by the container health check settings. \n  \n For services that *do* use a load balancer, the following should be noted:\n  +  If a task has no essential containers with a health check defined, the service scheduler will wait for the load balancer target group health check to return a healthy status before counting the task towards the minimum healthy percent total.\n  +  If a task has an essential container with a health check defined, the service scheduler will wait for both the task to reach a healthy status and the load balancer target group health check to return a healthy status before counting the task towards the minimum healthy percent total.\n  \n The default value for a replica service for ``minimumHealthyPercent`` is 100%. The default ``minimumHealthyPercent`` value for a service using the ``DAEMON`` service schedule is 0% for the CLI, the AWS SDKs, and the APIs and 50% for the AWS Management Console.\n The minimum number of healthy tasks during a deployment is the ``desiredCount`` multiplied by the ``minimumHealthyPercent``/100, rounded up to the nearest integer value.\n If a service is using either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types and is running tasks that use the EC2 launch type, the *minimum healthy percent* value is set to the default value. The *minimum healthy percent* value is used to define the lower limit on the number of the tasks in the service that remain in the ``RUNNING`` state while the container instances are in the ``DRAINING`` state.\n  You can't specify a custom ``minimumHealthyPercent`` value for a service that uses either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types and has tasks that use the EC2 launch type.\n  If a service is using either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types and is running tasks that use the Fargate launch type, the minimum healthy percent value is not used, although it is returned when describing your service.",
+          "description": "If a service is using the rolling update (``ECS``) deployment type, the ``minimumHealthyPercent`` represents a lower limit on the number of your service's tasks that must remain in the ``RUNNING`` state during a deployment, as a percentage of the ``desiredCount`` (rounded up to the nearest integer). This parameter enables you to deploy without using additional cluster capacity. For example, if your service has a ``desiredCount`` of four tasks and a ``minimumHealthyPercent`` of 50%, the service scheduler may stop two existing tasks to free up cluster capacity before starting two new tasks. \n  If any tasks are unhealthy and if ``maximumPercent`` doesn't allow the Amazon ECS scheduler to start replacement tasks, the scheduler stops the unhealthy tasks one-by-one — using the ``minimumHealthyPercent`` as a constraint — to clear up capacity to launch replacement tasks. For more information about how the scheduler replaces unhealthy tasks, see [Amazon ECS services](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html) . \n For services that *do not* use a load balancer, the following should be noted:\n  +  A service is considered healthy if all essential containers within the tasks in the service pass their health checks.\n  +  If a task has no essential containers with a health check defined, the service scheduler will wait for 40 seconds after a task reaches a ``RUNNING`` state before the task is counted towards the minimum healthy percent total.\n  +  If a task has one or more essential containers with a health check defined, the service scheduler will wait for the task to reach a healthy status before counting it towards the minimum healthy percent total. A task is considered healthy when all essential containers within the task have passed their health checks. The amount of time the service scheduler can wait for is determined by the container health check settings. \n  \n For services that *do* use a load balancer, the following should be noted:\n  +  If a task has no essential containers with a health check defined, the service scheduler will wait for the load balancer target group health check to return a healthy status before counting the task towards the minimum healthy percent total.\n  +  If a task has an essential container with a health check defined, the service scheduler will wait for both the task to reach a healthy status and the load balancer target group health check to return a healthy status before counting the task towards the minimum healthy percent total.\n  \n The default value for a replica service for ``minimumHealthyPercent`` is 100%. The default ``minimumHealthyPercent`` value for a service using the ``DAEMON`` service schedule is 0% for the CLI, the AWS SDKs, and the APIs and 50% for the AWS Management Console.\n The minimum number of healthy tasks during a deployment is the ``desiredCount`` multiplied by the ``minimumHealthyPercent``/100, rounded up to the nearest integer value.\n If a service is using either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types and is running tasks that use the EC2 launch type, the *minimum healthy percent* value is set to the default value. The *minimum healthy percent* value is used to define the lower limit on the number of the tasks in the service that remain in the ``RUNNING`` state while the container instances are in the ``DRAINING`` state.\n  You can't specify a custom ``minimumHealthyPercent`` value for a service that uses either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types and has tasks that use the EC2 launch type.\n  If a service is using either the blue/green (``CODE_DEPLOY``) or ``EXTERNAL`` deployment types and is running tasks that use the Fargate launch type, the minimum healthy percent value is not used, although it is returned when describing your service.",
           "type": "integer"
         }
       }
@@ -674,7 +678,7 @@
       }
     },
     "CapacityProviderStrategy": {
-      "description": "The capacity provider strategy to use for the service.\n If a ``capacityProviderStrategy`` is specified, the ``launchType`` parameter must be omitted. If no ``capacityProviderStrategy`` or ``launchType`` is specified, the ``defaultCapacityProviderStrategy`` for the cluster is used.\n A capacity provider strategy may contain a maximum of 6 capacity providers.",
+      "description": "The capacity provider strategy to use for the service.\n If a ``capacityProviderStrategy`` is specified, the ``launchType`` parameter must be omitted. If no ``capacityProviderStrategy`` or ``launchType`` is specified, the ``defaultCapacityProviderStrategy`` for the cluster is used.\n A capacity provider strategy can contain a maximum of 20 capacity providers.",
       "type": "array",
       "items": {
         "$ref": "#/definitions/CapacityProviderStrategyItem"
diff --git a/internal/aws/cfn/schemas/aws/ecs/taskdefinition.json b/internal/aws/cfn/schemas/aws/ecs/taskdefinition.json
index 242d4ae2..76bc3303 100644
--- a/internal/aws/cfn/schemas/aws/ecs/taskdefinition.json
+++ b/internal/aws/cfn/schemas/aws/ecs/taskdefinition.json
@@ -503,7 +503,7 @@
               "type": "string"
             }
           },
-          "description": "The configuration options to send to the log driver.\n The options you can specify depend on the log driver. Some of the options you can specify when you use the ``awslogs`` log driver to route logs to Amazon CloudWatch include the following:\n  + awslogs-create-group Required: No Specify whether you want the log group to be created automatically. If this option isn't specified, it defaults to false. Your IAM policy must include the logs:CreateLogGroup permission before you attempt to use awslogs-create-group. + awslogs-region Required: Yes Specify the Region that the awslogs log driver is to send your Docker logs to. You can choose to send all of your logs from clusters in different Regions to a single region in CloudWatch Logs. This is so that they're all visible in one location. Otherwise, you can separate them by Region for more granularity. Make sure that the specified log group exists in the Region that you specify with this option. + awslogs-group Required: Yes Make sure to specify a log group that the awslogs log driver sends its log streams to. + awslogs-stream-prefix Required: Yes, when using the Fargate launch type.Optional for the EC2 launch type, required for the Fargate launch type. Use the awslogs-stream-prefix option to associate a log stream with the specified prefix, the container name, and the ID of the Amazon ECS task that the container belongs to. If you specify a prefix with this option, then the log stream takes the format prefix-name/container-name/ecs-task-id. If you don't specify a prefix with this option, then the log stream is named after the container ID that's assigned by the Docker daemon on the container instance. Because it's difficult to trace logs back to the container that sent them with just the Docker container ID (which is only available on the container instance), we recommend that you specify a prefix with this option. For Amazon ECS services, you can use the service name as the prefix. Doing so, you can trace log streams to the service that the container belongs to, the name of the container that sent them, and the ID of the task that the container belongs to. You must specify a stream-prefix for your logs to have your logs appear in the Log pane when using the Amazon ECS console. + awslogs-datetime-format Required: No This option defines a multiline start pattern in Python strftime format. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. One example of a use case for using this format is for parsing output such as a stack dump, which might otherwise be logged in multiple entries. The correct pattern allows it to be captured in a single entry. For more information, see awslogs-datetime-format. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + awslogs-multiline-pattern Required: No This option defines a multiline start pattern that uses a regular expression. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. For more information, see awslogs-multiline-pattern. This option is ignored if awslogs-datetime-format is also configured. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + mode Required: No Valid values: non-blocking | blocking This option defines the delivery mode of log messages from the container to CloudWatch Logs. The delivery mode you choose affects application availability when the flow of logs from container to CloudWatch is interrupted. If you use the blocking mode and the flow of logs to CloudWatch is interrupted, calls from container code to write to the stdout and stderr streams will block. The logging thread of the application will block as a result. This may cause the application to become unresponsive and lead to container healthcheck failure. If you use the non-blocking mode, the container's logs are instead stored in an in-memory intermediate buffer configured with the max-buffer-size option. This prevents the application from becoming unresponsive when logs cannot be sent to CloudWatch. We recommend using this mode if you want to ensure service availability and are okay with some log loss. For more information, see Preventing log loss with non-blocking mode in the awslogs container log driver. + max-buffer-size Required: No Default value: 1m When non-blocking mode is used, the max-buffer-size log option controls the size of the buffer that's used for intermediate message storage. Make sure to specify an adequate buffer size based on your application. When the buffer fills up, further logs cannot be stored. Logs that cannot be stored are lost. \n To route logs using the ``splunk`` log router, you need to specify a ``splunk-token`` and a ``splunk-url``.\n When you use the ``awsfirelens`` log router to route logs to an AWS Service or AWS Partner Network destination for log storage and analytics, you can set the ``log-driver-buffer-limit`` option to limit the number of events that are buffered in memory, before being sent to the log router container. It can help to resolve potential log loss issue because high throughput might result in memory running out for the buffer inside of Docker.\n Other options you can specify when using ``awsfirelens`` to route logs depend on the destination. When you export logs to Amazon Data Firehose, you can specify the AWS Region with ``region`` and a name for the log stream with ``delivery_stream``.\n When you export logs to Amazon Kinesis Data Streams, you can specify an AWS Region with ``region`` and a data stream name with ``stream``.\n  When you export logs to Amazon OpenSearch Service, you can specify options like ``Name``, ``Host`` (OpenSearch Service endpoint without protocol), ``Port``, ``Index``, ``Type``, ``Aws_auth``, ``Aws_region``, ``Suppress_Type_Name``, and ``tls``.\n When you export logs to Amazon S3, you can specify the bucket using the ``bucket`` option. You can also specify ``region``, ``total_file_size``, ``upload_timeout``, and ``use_put_object`` as options.\n This parameter requires version 1.19 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version --format '{{.Server.APIVersion}}'``",
+          "description": "The configuration options to send to the log driver.\n The options you can specify depend on the log driver. Some of the options you can specify when you use the ``awslogs`` log driver to route logs to Amazon CloudWatch include the following:\n  + awslogs-create-group Required: No Specify whether you want the log group to be created automatically. If this option isn't specified, it defaults to false. Your IAM policy must include the logs:CreateLogGroup permission before you attempt to use awslogs-create-group. + awslogs-region Required: Yes Specify the Region that the awslogs log driver is to send your Docker logs to. You can choose to send all of your logs from clusters in different Regions to a single region in CloudWatch Logs. This is so that they're all visible in one location. Otherwise, you can separate them by Region for more granularity. Make sure that the specified log group exists in the Region that you specify with this option. + awslogs-group Required: Yes Make sure to specify a log group that the awslogs log driver sends its log streams to. + awslogs-stream-prefix Required: Yes, when using the Fargate launch type.Optional for the EC2 launch type, required for the Fargate launch type. Use the awslogs-stream-prefix option to associate a log stream with the specified prefix, the container name, and the ID of the Amazon ECS task that the container belongs to. If you specify a prefix with this option, then the log stream takes the format prefix-name/container-name/ecs-task-id. If you don't specify a prefix with this option, then the log stream is named after the container ID that's assigned by the Docker daemon on the container instance. Because it's difficult to trace logs back to the container that sent them with just the Docker container ID (which is only available on the container instance), we recommend that you specify a prefix with this option. For Amazon ECS services, you can use the service name as the prefix. Doing so, you can trace log streams to the service that the container belongs to, the name of the container that sent them, and the ID of the task that the container belongs to. You must specify a stream-prefix for your logs to have your logs appear in the Log pane when using the Amazon ECS console. + awslogs-datetime-format Required: No This option defines a multiline start pattern in Python strftime format. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. One example of a use case for using this format is for parsing output such as a stack dump, which might otherwise be logged in multiple entries. The correct pattern allows it to be captured in a single entry. For more information, see awslogs-datetime-format. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + awslogs-multiline-pattern Required: No This option defines a multiline start pattern that uses a regular expression. A log message consists of a line that matches the pattern and any following lines that don’t match the pattern. The matched line is the delimiter between log messages. For more information, see awslogs-multiline-pattern. This option is ignored if awslogs-datetime-format is also configured. You cannot configure both the awslogs-datetime-format and awslogs-multiline-pattern options. Multiline logging performs regular expression parsing and matching of all log messages. This might have a negative impact on logging performance. + mode Required: No Valid values: non-blocking | blocking This option defines the delivery mode of log messages from the container to CloudWatch Logs. The delivery mode you choose affects application availability when the flow of logs from container to CloudWatch is interrupted. If you use the blocking mode and the flow of logs to CloudWatch is interrupted, calls from container code to write to the stdout and stderr streams will block. The logging thread of the application will block as a result. This may cause the application to become unresponsive and lead to container healthcheck failure. If you use the non-blocking mode, the container's logs are instead stored in an in-memory intermediate buffer configured with the max-buffer-size option. This prevents the application from becoming unresponsive when logs cannot be sent to CloudWatch. We recommend using this mode if you want to ensure service availability and are okay with some log loss. For more information, see Preventing log loss with non-blocking mode in the awslogs container log driver. + max-buffer-size Required: No Default value: 1m When non-blocking mode is used, the max-buffer-size log option controls the size of the buffer that's used for intermediate message storage. Make sure to specify an adequate buffer size based on your application. When the buffer fills up, further logs cannot be stored. Logs that cannot be stored are lost. \n To route logs using the ``splunk`` log router, you need to specify a ``splunk-token`` and a ``splunk-url``.\n When you use the ``awsfirelens`` log router to route logs to an AWS Service or AWS Partner Network destination for log storage and analytics, you can set the ``log-driver-buffer-limit`` option to limit the number of events that are buffered in memory, before being sent to the log router container. It can help to resolve potential log loss issue because high throughput might result in memory running out for the buffer inside of Docker.\n Other options you can specify when using ``awsfirelens`` to route logs depend on the destination. When you export logs to Amazon Data Firehose, you can specify the AWS Region with ``region`` and a name for the log stream with ``delivery_stream``.\n When you export logs to Amazon Kinesis Data Streams, you can specify an AWS Region with ``region`` and a data stream name with ``stream``.\n  When you export logs to Amazon OpenSearch Service, you can specify options like ``Name``, ``Host`` (OpenSearch Service endpoint without protocol), ``Port``, ``Index``, ``Type``, ``Aws_auth``, ``Aws_region``, ``Suppress_Type_Name``, and ``tls``. For more information, see [Under the hood: FireLens for Amazon ECS Tasks](https://docs.aws.amazon.com/containers/under-the-hood-firelens-for-amazon-ecs-tasks/).\n When you export logs to Amazon S3, you can specify the bucket using the ``bucket`` option. You can also specify ``region``, ``total_file_size``, ``upload_timeout``, and ``use_put_object`` as options.\n This parameter requires version 1.19 of the Docker Remote API or greater on your container instance. To check the Docker Remote API version on your container instance, log in to your container instance and run the following command: ``sudo docker version --format '{{.Server.APIVersion}}'``",
           "additionalProperties": false,
           "type": "object"
         },
@@ -1123,7 +1123,7 @@
       "type": "string"
     },
     "EnableFaultInjection": {
-      "description": "",
+      "description": "Enables fault injection and allows for fault injection requests to be accepted from the task's containers. The default value is ``false``.",
       "type": "boolean"
     },
     "ExecutionRoleArn": {
diff --git a/internal/aws/cfn/schemas/aws/efs/filesystem.json b/internal/aws/cfn/schemas/aws/efs/filesystem.json
index 7adad990..4744b213 100644
--- a/internal/aws/cfn/schemas/aws/efs/filesystem.json
+++ b/internal/aws/cfn/schemas/aws/efs/filesystem.json
@@ -72,7 +72,7 @@
             "DISABLED",
             "ENABLED"
           ],
-          "description": "The status of the file system's replication overwrite protection.\n  +   ``ENABLED`` ? The file system cannot be used as the destination file system in a replication configuration. The file system is writeable. Replication overwrite protection is ``ENABLED`` by default. \n  +   ``DISABLED`` ? The file system can be used as the destination file system in a replication configuration. The file system is read-only and can only be modified by EFS replication.\n  +   ``REPLICATING`` ? The file system is being used as the destination file system in a replication configuration. The file system is read-only and is only modified only by EFS replication.\n  \n If the replication configuration is deleted, the file system's replication overwrite protection is re-enabled, the file system becomes writeable."
+          "description": "The status of the file system's replication overwrite protection.\n  +   ``ENABLED`` ? The file system cannot be used as the destination file system in a replication configuration. The file system is writeable. Replication overwrite protection is ``ENABLED`` by default. \n  +   ``DISABLED`` ? The file system can be used as the destination file system in a replication configuration. The file system is read-only and can only be modified by EFS replication.\n  +   ``REPLICATING`` ? The file system is being used as the destination file system in a replication configuration. The file system is read-only and is modified only by EFS replication.\n  \n If the replication configuration is deleted, the file system's replication overwrite protection is re-enabled, the file system becomes writeable."
         }
       },
       "description": "Describes the protection on the file system."
@@ -83,11 +83,11 @@
       "properties": {
         "Status": {
           "type": "string",
-          "description": ""
+          "description": "Describes the status of the replication configuration. For more information about replication status, see [Viewing replication details](https://docs.aws.amazon.com//efs/latest/ug/awsbackup.html#restoring-backup-efsmonitoring-replication-status.html) in the *Amazon EFS User Guide*."
         },
         "StatusMessage": {
           "type": "string",
-          "description": ""
+          "description": "Message that provides details about the ``PAUSED`` or ``ERRROR`` state of the replication destination configuration. For more information about replication status messages, see [Viewing replication details](https://docs.aws.amazon.com//efs/latest/ug/awsbackup.html#restoring-backup-efsmonitoring-replication-status.html) in the *Amazon EFS User Guide*."
         },
         "FileSystemId": {
           "pattern": "^(arn:aws[-a-z]*:elasticfilesystem:[0-9a-z-:]+:file-system/fs-[0-9a-f]{8,40}|fs-[0-9a-f]{8,40})$",
@@ -100,7 +100,7 @@
         },
         "RoleArn": {
           "type": "string",
-          "description": ""
+          "description": "The Amazon Resource Name (ARN) of the current source file system in the replication configuration."
         },
         "AvailabilityZoneName": {
           "type": "string",
diff --git a/internal/aws/cfn/schemas/aws/eks/cluster.json b/internal/aws/cfn/schemas/aws/eks/cluster.json
index 28c43c2f..b4c23037 100644
--- a/internal/aws/cfn/schemas/aws/eks/cluster.json
+++ b/internal/aws/cfn/schemas/aws/eks/cluster.json
@@ -507,7 +507,8 @@
   "createOnlyProperties": [
     "/properties/OutpostConfig",
     "/properties/EncryptionConfig",
-    "/properties/KubernetesNetworkConfig",
+    "/properties/KubernetesNetworkConfig/IpFamily",
+    "/properties/KubernetesNetworkConfig/ServiceIpv4Cidr",
     "/properties/AccessConfig/BootstrapClusterCreatorAdminPermissions",
     "/properties/Name",
     "/properties/RoleArn",
diff --git a/internal/aws/cfn/schemas/aws/gamelift/location.json b/internal/aws/cfn/schemas/aws/gamelift/location.json
index c9225697..48b63c34 100644
--- a/internal/aws/cfn/schemas/aws/gamelift/location.json
+++ b/internal/aws/cfn/schemas/aws/gamelift/location.json
@@ -6,7 +6,14 @@
   "tagging": {
     "taggable": true,
     "cloudFormationSystemTags": false,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "permissions": [
+      "gamelift:ListTagsForResource",
+      "gamelift:TagResource",
+      "gamelift:UntagResource"
+    ]
   },
   "definitions": {
     "Tag": {
diff --git a/internal/aws/cfn/schemas/aws/gamelift/matchmakingconfiguration.json b/internal/aws/cfn/schemas/aws/gamelift/matchmakingconfiguration.json
index ea1096da..afc43fdf 100644
--- a/internal/aws/cfn/schemas/aws/gamelift/matchmakingconfiguration.json
+++ b/internal/aws/cfn/schemas/aws/gamelift/matchmakingconfiguration.json
@@ -6,7 +6,14 @@
   "tagging": {
     "taggable": true,
     "cloudFormationSystemTags": false,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "permissions": [
+      "gamelift:ListTagsForResource",
+      "gamelift:TagResource",
+      "gamelift:UntagResource"
+    ]
   },
   "definitions": {
     "GameProperty": {
diff --git a/internal/aws/cfn/schemas/aws/gamelift/matchmakingruleset.json b/internal/aws/cfn/schemas/aws/gamelift/matchmakingruleset.json
index 0e87df79..9f51393d 100644
--- a/internal/aws/cfn/schemas/aws/gamelift/matchmakingruleset.json
+++ b/internal/aws/cfn/schemas/aws/gamelift/matchmakingruleset.json
@@ -6,7 +6,14 @@
   "tagging": {
     "taggable": true,
     "cloudFormationSystemTags": false,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "permissions": [
+      "gamelift:ListTagsForResource",
+      "gamelift:TagResource",
+      "gamelift:UntagResource"
+    ]
   },
   "definitions": {
     "Tag": {
diff --git a/internal/aws/cfn/schemas/aws/imagebuilder/image.json b/internal/aws/cfn/schemas/aws/imagebuilder/image.json
index ad3faeb6..cb5c4d6d 100644
--- a/internal/aws/cfn/schemas/aws/imagebuilder/image.json
+++ b/internal/aws/cfn/schemas/aws/imagebuilder/image.json
@@ -1,97 +1,103 @@
 {
-  "typeName": "AWS::ImageBuilder::Image",
-  "description": "Resource schema for AWS::ImageBuilder::Image",
   "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-imagebuilder",
-  "properties": {
-    "Arn": {
-      "description": "The Amazon Resource Name (ARN) of the image.",
-      "type": "string"
-    },
-    "Name": {
-      "description": "The name of the image.",
-      "type": "string"
-    },
-    "ImageTestsConfiguration": {
-      "description": "The image tests configuration used when creating this image.",
-      "$ref": "#/definitions/ImageTestsConfiguration"
-    },
-    "ImageRecipeArn": {
-      "description": "The Amazon Resource Name (ARN) of the image recipe that defines how images are configured, tested, and assessed.",
-      "type": "string"
+  "tagging": {
+    "taggable": false
+  },
+  "oneOf": [
+    {
+      "required": [
+        "ContainerRecipeArn",
+        "InfrastructureConfigurationArn"
+      ]
     },
-    "ContainerRecipeArn": {
-      "description": "The Amazon Resource Name (ARN) of the container recipe that defines how images are configured and tested.",
-      "type": "string"
+    {
+      "required": [
+        "ImageRecipeArn",
+        "InfrastructureConfigurationArn"
+      ]
     },
-    "DistributionConfigurationArn": {
-      "description": "The Amazon Resource Name (ARN) of the distribution configuration.",
-      "type": "string"
+    {
+      "required": [
+        "ImportDiskImageSettings"
+      ]
+    }
+  ],
+  "handlers": {
+    "read": {
+      "permissions": [
+        "imagebuilder:GetImage"
+      ]
     },
-    "InfrastructureConfigurationArn": {
-      "description": "The Amazon Resource Name (ARN) of the infrastructure configuration.",
-      "type": "string"
+    "create": {
+      "permissions": [
+        "ecr:BatchGetRepositoryScanningConfiguration",
+        "iam:GetRole",
+        "iam:PassRole",
+        "iam:CreateServiceLinkedRole",
+        "imagebuilder:GetImageRecipe",
+        "imagebuilder:GetInfrastructureConfiguration",
+        "imagebuilder:GetDistributionConfiguration",
+        "imagebuilder:GetWorkflow",
+        "imagebuilder:GetImage",
+        "imagebuilder:CreateImage",
+        "imagebuilder:TagResource",
+        "inspector2:BatchGetAccountStatus"
+      ],
+      "timeoutInMinutes": 720
     },
-    "Workflows": {
-      "description": "Workflows to define the image build process",
-      "type": "array",
-      "insertionOrder": true,
-      "items": {
-        "$ref": "#/definitions/WorkflowConfiguration"
+    "list": {
+      "permissions": [
+        "imagebuilder:ListImages",
+        "imagebuilder:ListImageBuildVersions"
+      ],
+      "handlerSchema": {
+        "properties": {
+          "Arn": {
+            "$ref": "resource-schema.json#/properties/Arn"
+          }
+        },
+        "required": [
+          "Arn"
+        ]
       }
     },
-    "ImageId": {
-      "description": "The AMI ID of the EC2 AMI in current region.",
-      "type": "string"
-    },
-    "ImageUri": {
-      "description": "URI for containers created in current Region with default ECR image tag",
-      "type": "string"
-    },
-    "EnhancedImageMetadataEnabled": {
-      "description": "Collects additional information about the image being created, including the operating system (OS) version and package list.",
-      "type": "boolean"
-    },
-    "ImageScanningConfiguration": {
-      "description": "Contains settings for vulnerability scans.",
-      "$ref": "#/definitions/ImageScanningConfiguration"
-    },
-    "ExecutionRole": {
-      "description": "The execution role name/ARN for the image build, if provided",
-      "type": "string"
-    },
-    "Tags": {
-      "description": "The tags associated with the image.",
-      "type": "object",
-      "additionalProperties": false,
-      "patternProperties": {
-        ".{1,}": {
-          "type": "string"
-        }
-      }
+    "delete": {
+      "permissions": [
+        "imagebuilder:GetImage",
+        "imagebuilder:DeleteImage",
+        "imagebuilder:UnTagResource",
+        "imagebuilder:CancelImageCreation"
+      ]
     }
   },
+  "typeName": "AWS::ImageBuilder::Image",
+  "readOnlyProperties": [
+    "/properties/Arn",
+    "/properties/Name",
+    "/properties/ImageId",
+    "/properties/ImageUri"
+  ],
+  "description": "Resource schema for AWS::ImageBuilder::Image",
+  "createOnlyProperties": [
+    "/properties/ImageRecipeArn",
+    "/properties/ContainerRecipeArn",
+    "/properties/InfrastructureConfigurationArn",
+    "/properties/Workflows",
+    "/properties/DistributionConfigurationArn",
+    "/properties/ImageTestsConfiguration",
+    "/properties/ImageScanningConfiguration",
+    "/properties/EnhancedImageMetadataEnabled",
+    "/properties/Tags"
+  ],
+  "additionalProperties": false,
+  "primaryIdentifier": [
+    "/properties/Arn"
+  ],
   "definitions": {
-    "ImageTestsConfiguration": {
-      "description": "The image tests configuration used when creating this image.",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "ImageTestsEnabled": {
-          "description": "ImageTestsEnabled",
-          "type": "boolean"
-        },
-        "TimeoutMinutes": {
-          "description": "TimeoutMinutes",
-          "type": "integer",
-          "minimum": 60,
-          "maximum": 1440
-        }
-      }
-    },
     "ImageScanningConfiguration": {
       "description": "Contains settings for Image Builder image resource and container image scans.",
-      "type": "object",
       "additionalProperties": false,
+      "type": "object",
       "properties": {
         "EcrConfiguration": {
           "description": "Contains ECR settings for vulnerability scans.",
@@ -103,44 +109,25 @@
         }
       }
     },
-    "EcrConfiguration": {
-      "description": "Settings for Image Builder to configure the ECR repository and output container images that are scanned.",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "ContainerTags": {
-          "description": "Tags for Image Builder to apply the output container image that is scanned. Tags can help you identify and manage your scanned images.",
-          "type": "array",
-          "insertionOrder": true,
-          "items": {
-            "type": "string"
-          }
-        },
-        "RepositoryName": {
-          "description": "The name of the container repository that Amazon Inspector scans to identify findings for your container images. The name includes the path for the repository location. If you don?t provide this information, Image Builder creates a repository in your account named image-builder-image-scanning-repository to use for vulnerability scans for your output container images.",
-          "type": "string"
-        }
-      }
-    },
     "WorkflowConfiguration": {
       "description": "The workflow configuration of the image",
-      "type": "object",
       "additionalProperties": false,
+      "type": "object",
       "properties": {
-        "WorkflowArn": {
-          "description": "The Amazon Resource Name (ARN) of the workflow",
+        "ParallelGroup": {
+          "description": "The parallel group name",
           "type": "string"
         },
         "Parameters": {
           "description": "The parameters associated with the workflow",
-          "type": "array",
           "insertionOrder": false,
+          "type": "array",
           "items": {
             "$ref": "#/definitions/WorkflowParameter"
           }
         },
-        "ParallelGroup": {
-          "description": "The parallel group name",
+        "WorkflowArn": {
+          "description": "The Amazon Resource Name (ARN) of the workflow",
           "type": "string"
         },
         "OnFailure": {
@@ -153,112 +140,130 @@
         }
       }
     },
-    "WorkflowParameter": {
-      "description": "A parameter associated with the workflow",
-      "type": "object",
+    "EcrConfiguration": {
+      "description": "Settings for Image Builder to configure the ECR repository and output container images that are scanned.",
       "additionalProperties": false,
+      "type": "object",
       "properties": {
-        "Name": {
-          "type": "string"
-        },
-        "Value": {
-          "type": "array",
+        "ContainerTags": {
+          "description": "Tags for Image Builder to apply the output container image that is scanned. Tags can help you identify and manage your scanned images.",
           "insertionOrder": true,
+          "type": "array",
           "items": {
-            "$ref": "#/definitions/WorkflowParameterValue"
+            "type": "string"
           }
+        },
+        "RepositoryName": {
+          "description": "The name of the container repository that Amazon Inspector scans to identify findings for your container images. The name includes the path for the repository location. If you don’t provide this information, Image Builder creates a repository in your account named image-builder-image-scanning-repository to use for vulnerability scans for your output container images.",
+          "type": "string"
         }
       }
     },
     "WorkflowParameterValue": {
       "description": "The value associated with the workflow parameter",
       "type": "string"
-    }
-  },
-  "additionalProperties": false,
-  "oneOf": [
-    {
-      "required": [
-        "ContainerRecipeArn",
-        "InfrastructureConfigurationArn"
-      ]
     },
-    {
-      "required": [
-        "ImageRecipeArn",
-        "InfrastructureConfigurationArn"
-      ]
+    "ImageTestsConfiguration": {
+      "description": "The image tests configuration used when creating this image.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+        "TimeoutMinutes": {
+          "description": "TimeoutMinutes",
+          "maximum": 1440,
+          "type": "integer",
+          "minimum": 60
+        },
+        "ImageTestsEnabled": {
+          "description": "ImageTestsEnabled",
+          "type": "boolean"
+        }
+      }
+    },
+    "WorkflowParameter": {
+      "description": "A parameter associated with the workflow",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+        "Value": {
+          "insertionOrder": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/WorkflowParameterValue"
+          }
+        },
+        "Name": {
+          "type": "string"
+        }
+      }
     }
-  ],
-  "primaryIdentifier": [
-    "/properties/Arn"
-  ],
-  "readOnlyProperties": [
-    "/properties/Arn",
-    "/properties/Name",
-    "/properties/ImageId",
-    "/properties/ImageUri"
-  ],
-  "createOnlyProperties": [
-    "/properties/ImageRecipeArn",
-    "/properties/ContainerRecipeArn",
-    "/properties/InfrastructureConfigurationArn",
-    "/properties/Workflows",
-    "/properties/DistributionConfigurationArn",
-    "/properties/ImageTestsConfiguration",
-    "/properties/ImageScanningConfiguration",
-    "/properties/EnhancedImageMetadataEnabled",
-    "/properties/Tags"
-  ],
-  "tagging": {
-    "taggable": false
   },
-  "handlers": {
-    "create": {
-      "permissions": [
-        "ecr:BatchGetRepositoryScanningConfiguration",
-        "iam:GetRole",
-        "iam:PassRole",
-        "iam:CreateServiceLinkedRole",
-        "imagebuilder:GetImageRecipe",
-        "imagebuilder:GetInfrastructureConfiguration",
-        "imagebuilder:GetDistributionConfiguration",
-        "imagebuilder:GetWorkflow",
-        "imagebuilder:GetImage",
-        "imagebuilder:CreateImage",
-        "imagebuilder:TagResource",
-        "inspector2:BatchGetAccountStatus"
-      ],
-      "timeoutInMinutes": 720
-    },
-    "read": {
-      "permissions": [
-        "imagebuilder:GetImage"
-      ]
+  "properties": {
+    "ImageScanningConfiguration": {
+      "description": "Contains settings for vulnerability scans.",
+      "$ref": "#/definitions/ImageScanningConfiguration"
     },
-    "delete": {
-      "permissions": [
-        "imagebuilder:GetImage",
-        "imagebuilder:DeleteImage",
-        "imagebuilder:UnTagResource",
-        "imagebuilder:CancelImageCreation"
-      ]
+    "ContainerRecipeArn": {
+      "description": "The Amazon Resource Name (ARN) of the container recipe that defines how images are configured and tested.",
+      "type": "string"
     },
-    "list": {
-      "permissions": [
-        "imagebuilder:ListImages",
-        "imagebuilder:ListImageBuildVersions"
-      ],
-      "handlerSchema": {
-        "properties": {
-          "Arn": {
-            "$ref": "resource-schema.json#/properties/Arn"
-          }
-        },
-        "required": [
-          "Arn"
-        ]
+    "Workflows": {
+      "description": "Workflows to define the image build process",
+      "insertionOrder": true,
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/WorkflowConfiguration"
       }
+    },
+    "ImageUri": {
+      "description": "URI for containers created in current Region with default ECR image tag",
+      "type": "string"
+    },
+    "Name": {
+      "description": "The name of the image.",
+      "type": "string"
+    },
+    "InfrastructureConfigurationArn": {
+      "description": "The Amazon Resource Name (ARN) of the infrastructure configuration.",
+      "type": "string"
+    },
+    "ImageRecipeArn": {
+      "description": "The Amazon Resource Name (ARN) of the image recipe that defines how images are configured, tested, and assessed.",
+      "type": "string"
+    },
+    "DistributionConfigurationArn": {
+      "description": "The Amazon Resource Name (ARN) of the distribution configuration.",
+      "type": "string"
+    },
+    "ImageId": {
+      "description": "The AMI ID of the EC2 AMI in current region.",
+      "type": "string"
+    },
+    "ImageTestsConfiguration": {
+      "description": "The image tests configuration used when creating this image.",
+      "$ref": "#/definitions/ImageTestsConfiguration"
+    },
+    "Arn": {
+      "description": "The Amazon Resource Name (ARN) of the image.",
+      "type": "string"
+    },
+    "EnhancedImageMetadataEnabled": {
+      "description": "Collects additional information about the image being created, including the operating system (OS) version and package list.",
+      "type": "boolean"
+    },
+    "ExecutionRole": {
+      "description": "The execution role name/ARN for the image build, if provided",
+      "type": "string"
+    },
+    "Tags": {
+      "patternProperties": {
+        ".{1,}": {
+          "type": "string"
+        }
+      },
+      "description": "The tags associated with the image.",
+      "additionalProperties": false,
+      "type": "object"
     }
   }
 }
diff --git a/internal/aws/cfn/schemas/aws/kafkaconnect/connector.json b/internal/aws/cfn/schemas/aws/kafkaconnect/connector.json
index 2b72ce6d..be35c5f9 100644
--- a/internal/aws/cfn/schemas/aws/kafkaconnect/connector.json
+++ b/internal/aws/cfn/schemas/aws/kafkaconnect/connector.json
@@ -501,7 +501,6 @@
   ],
   "replacementStrategy": "delete_then_create",
   "createOnlyProperties": [
-    "/properties/ConnectorConfiguration",
     "/properties/ConnectorDescription",
     "/properties/ConnectorName",
     "/properties/KafkaCluster",
@@ -555,7 +554,9 @@
     "update": {
       "permissions": [
         "kafkaconnect:UpdateConnector",
+        "kafkaconnect:UpdateConnectorConfiguration",
         "kafkaconnect:DescribeConnector",
+        "kafkaconnect:DescribeConnectorOperation",
         "kafkaconnect:TagResource",
         "kafkaconnect:ListTagsForResource",
         "kafkaconnect:UntagResource",
diff --git a/internal/aws/cfn/schemas/aws/lex/bot.json b/internal/aws/cfn/schemas/aws/lex/bot.json
index ee17f572..ee51d230 100644
--- a/internal/aws/cfn/schemas/aws/lex/bot.json
+++ b/internal/aws/cfn/schemas/aws/lex/bot.json
@@ -3,6 +3,33 @@
   "description": "Amazon Lex conversational bot performing automated tasks such as ordering a pizza, booking a hotel, and so on.",
   "sourceUrl": "https://docs.aws.amazon.com/lexv2/latest/dg/build-create.html",
   "definitions": {
+    "ReplicaRegion": {
+      "description": "The secondary region that will be used in the replication of the source bot.",
+      "type": "string",
+      "minLength": 2,
+      "maxLength": 25
+    },
+    "Replication": {
+      "description": "Parameter used to create a replication of the source bot in the secondary region.",
+      "type": "object",
+      "properties": {
+        "ReplicaRegions": {
+          "description": "List of secondary regions for bot replication.",
+          "type": "array",
+          "uniqueItems": true,
+          "maxItems": 1,
+          "minItems": 1,
+          "insertionOrder": false,
+          "items": {
+            "$ref": "#/definitions/ReplicaRegion"
+          }
+        }
+      },
+      "required": [
+        "ReplicaRegions"
+      ],
+      "additionalProperties": false
+    },
     "BotAliasLocaleSettingsList": {
       "description": "A list of bot alias locale settings to add to the bot alias.",
       "type": "array",
@@ -2216,6 +2243,9 @@
     },
     "TestBotAliasSettings": {
       "$ref": "#/definitions/TestBotAliasSettings"
+    },
+    "Replication": {
+      "$ref": "#/definitions/Replication"
     }
   },
   "taggable": true,
@@ -2238,7 +2268,8 @@
     "/properties/BotFileS3Location",
     "/properties/AutoBuildBotLocales",
     "/properties/BotTags",
-    "/properties/TestBotAliasTags"
+    "/properties/TestBotAliasTags",
+    "/properties/Replication"
   ],
   "handlers": {
     "create": {
@@ -2272,13 +2303,19 @@
         "lex:UpdateCustomVocabulary",
         "lex:DeleteCustomVocabulary",
         "s3:GetObject",
-        "lex:UpdateBotAlias"
+        "lex:UpdateBotAlias",
+        "iam:CreateServiceLinkedRole",
+        "iam:GetRole",
+        "lex:CreateBotReplica",
+        "lex:DescribeBotReplica",
+        "lex:DeleteBotReplica"
       ]
     },
     "read": {
       "permissions": [
         "lex:DescribeBot",
-        "lex:ListTagsForResource"
+        "lex:ListTagsForResource",
+        "lex:DescribeBotReplica"
       ]
     },
     "update": {
@@ -2313,7 +2350,10 @@
         "lex:UpdateCustomVocabulary",
         "lex:DeleteCustomVocabulary",
         "s3:GetObject",
-        "lex:UpdateBotAlias"
+        "lex:UpdateBotAlias",
+        "lex:CreateBotReplica",
+        "lex:DescribeBotReplica",
+        "lex:DeleteBotReplica"
       ]
     },
     "delete": {
@@ -2327,12 +2367,14 @@
         "lex:DeleteBotVersion",
         "lex:DeleteBotChannel",
         "lex:DeleteBotAlias",
-        "lex:DeleteCustomVocabulary"
+        "lex:DeleteCustomVocabulary",
+        "lex:DeleteBotReplica"
       ]
     },
     "list": {
       "permissions": [
-        "lex:ListBots"
+        "lex:ListBots",
+        "lex:ListBotReplicas"
       ]
     }
   }
diff --git a/internal/aws/cfn/schemas/aws/logs/loggroup.json b/internal/aws/cfn/schemas/aws/logs/loggroup.json
index 732ba15f..092ca182 100644
--- a/internal/aws/cfn/schemas/aws/logs/loggroup.json
+++ b/internal/aws/cfn/schemas/aws/logs/loggroup.json
@@ -4,7 +4,7 @@
   "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-logs.git",
   "definitions": {
     "Tag": {
-      "description": "",
+      "description": "The value of this key-value pair.",
       "type": "object",
       "additionalProperties": false,
       "properties": {
@@ -16,7 +16,7 @@
         },
         "Value": {
           "type": "string",
-          "description": "",
+          "description": "The value of this key-value pair.",
           "minLength": 0,
           "maxLength": 256
         }
@@ -46,7 +46,7 @@
       "type": "object"
     },
     "FieldIndexPolicies": {
-      "description": "",
+      "description": "Creates or updates a *field index policy* for the specified log group. Only log groups in the Standard log class support field index policies. For more information about log classes, see [Log classes](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatch_Logs_Log_Classes.html).\n You can use field index policies to create *field indexes* on fields found in log events in the log group. Creating field indexes lowers the costs for CWL Insights queries that reference those field indexes, because these queries attempt to skip the processing of log events that are known to not match the indexed field. Good fields to index are fields that you often need to query for and fields that have high cardinality of values Common examples of indexes include request ID, session ID, userID, and instance IDs. For more information, see [Create field indexes to improve query performance and reduce costs](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs-Field-Indexing.html).\n Currently, this array supports only one field index policy object.",
       "type": "array",
       "uniqueItems": true,
       "insertionOrder": false,
diff --git a/internal/aws/cfn/schemas/aws/logs/metricfilter.json b/internal/aws/cfn/schemas/aws/logs/metricfilter.json
index 2fe7c0c1..26d00863 100644
--- a/internal/aws/cfn/schemas/aws/logs/metricfilter.json
+++ b/internal/aws/cfn/schemas/aws/logs/metricfilter.json
@@ -155,7 +155,7 @@
       }
     },
     "ApplyOnTransformedLogs": {
-      "description": "",
+      "description": "This parameter is valid only for log groups that have an active log transformer. For more information about log transformers, see [PutTransformer](https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutTransformer.html).\n If this value is ``true``, the metric filter is applied on the transformed version of the log events instead of the original ingested log events.",
       "type": "boolean"
     }
   },
diff --git a/internal/aws/cfn/schemas/aws/logs/subscriptionfilter.json b/internal/aws/cfn/schemas/aws/logs/subscriptionfilter.json
index 335f4bf6..32ef81c2 100644
--- a/internal/aws/cfn/schemas/aws/logs/subscriptionfilter.json
+++ b/internal/aws/cfn/schemas/aws/logs/subscriptionfilter.json
@@ -40,7 +40,7 @@
       ]
     },
     "ApplyOnTransformedLogs": {
-      "description": "",
+      "description": "This parameter is valid only for log groups that have an active log transformer. For more information about log transformers, see [PutTransformer](https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutTransformer.html).\n If this value is ``true``, the subscription filter is applied on the transformed version of the log events instead of the original ingested log events.",
       "type": "boolean"
     }
   },
diff --git a/internal/aws/cfn/schemas/aws/macie/allowlist.json b/internal/aws/cfn/schemas/aws/macie/allowlist.json
index 5876c9b0..2e49bb8c 100644
--- a/internal/aws/cfn/schemas/aws/macie/allowlist.json
+++ b/internal/aws/cfn/schemas/aws/macie/allowlist.json
@@ -7,7 +7,11 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "macie2:TagResource",
+      "macie2:UntagResource"
+    ]
   },
   "definitions": {
     "Regex": {
diff --git a/internal/aws/cfn/schemas/aws/macie/customdataidentifier.json b/internal/aws/cfn/schemas/aws/macie/customdataidentifier.json
index 69e3d37b..1598b217 100644
--- a/internal/aws/cfn/schemas/aws/macie/customdataidentifier.json
+++ b/internal/aws/cfn/schemas/aws/macie/customdataidentifier.json
@@ -76,7 +76,11 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "macie2:TagResource",
+      "macie2:UntagResource"
+    ]
   },
   "required": [
     "Name",
@@ -129,7 +133,8 @@
     "update": {
       "permissions": [
         "macie2:TagResource",
-        "macie2:UntagResource"
+        "macie2:UntagResource",
+        "macie2:GetCustomDataIdentifier"
       ]
     }
   }
diff --git a/internal/aws/cfn/schemas/aws/macie/findingsfilter.json b/internal/aws/cfn/schemas/aws/macie/findingsfilter.json
index 1c5a8c3e..1bb0a8ca 100644
--- a/internal/aws/cfn/schemas/aws/macie/findingsfilter.json
+++ b/internal/aws/cfn/schemas/aws/macie/findingsfilter.json
@@ -138,7 +138,11 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "macie2:TagResource",
+      "macie2:UntagResource"
+    ]
   },
   "required": [
     "Name",
diff --git a/internal/aws/cfn/schemas/aws/mediaconnect/bridge.json b/internal/aws/cfn/schemas/aws/mediaconnect/bridge.json
index 32062901..c113ff7d 100644
--- a/internal/aws/cfn/schemas/aws/mediaconnect/bridge.json
+++ b/internal/aws/cfn/schemas/aws/mediaconnect/bridge.json
@@ -176,6 +176,10 @@
           "description": "The network source multicast IP.",
           "type": "string"
         },
+        "MulticastSourceSettings": {
+          "description": "The settings related to the multicast source.",
+          "$ref": "#/definitions/MulticastSourceSettings"
+        },
         "Port": {
           "description": "The network source port.",
           "type": "integer"
@@ -194,6 +198,17 @@
       ],
       "additionalProperties": false
     },
+    "MulticastSourceSettings": {
+      "type": "object",
+      "description": "The settings related to the multicast source.",
+      "properties": {
+        "MulticastSourceIp": {
+          "description": "The IP address of the source for source-specific multicast (SSM).",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
     "ProtocolEnum": {
       "type": "string",
       "enum": [
diff --git a/internal/aws/cfn/schemas/aws/mediaconnect/bridgesource.json b/internal/aws/cfn/schemas/aws/mediaconnect/bridgesource.json
index adc62968..91854191 100644
--- a/internal/aws/cfn/schemas/aws/mediaconnect/bridgesource.json
+++ b/internal/aws/cfn/schemas/aws/mediaconnect/bridgesource.json
@@ -44,6 +44,10 @@
           "description": "The network source multicast IP.",
           "type": "string"
         },
+        "MulticastSourceSettings": {
+          "description": "The settings related to the multicast source.",
+          "$ref": "#/definitions/MulticastSourceSettings"
+        },
         "Port": {
           "description": "The network source port.",
           "type": "integer"
@@ -61,6 +65,17 @@
       ],
       "additionalProperties": false
     },
+    "MulticastSourceSettings": {
+      "type": "object",
+      "description": "The settings related to the multicast source.",
+      "properties": {
+        "MulticastSourceIp": {
+          "description": "The IP address of the source for source-specific multicast (SSM).",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
     "ProtocolEnum": {
       "type": "string",
       "enum": [
diff --git a/internal/aws/cfn/schemas/aws/mediaconvert/queue.json b/internal/aws/cfn/schemas/aws/mediaconvert/queue.json
index c2f5ba10..5df01499 100644
--- a/internal/aws/cfn/schemas/aws/mediaconvert/queue.json
+++ b/internal/aws/cfn/schemas/aws/mediaconvert/queue.json
@@ -23,6 +23,9 @@
     },
     "Name": {
       "type": "string"
+    },
+    "ConcurrentJobs": {
+      "type": "integer"
     }
   },
   "createOnlyProperties": [
diff --git a/internal/aws/cfn/schemas/aws/opensearchservice/domain.json b/internal/aws/cfn/schemas/aws/opensearchservice/domain.json
index 1aed10ed..d094fa49 100644
--- a/internal/aws/cfn/schemas/aws/opensearchservice/domain.json
+++ b/internal/aws/cfn/schemas/aws/opensearchservice/domain.json
@@ -12,6 +12,36 @@
         }
       }
     },
+    "NodeConfig": {
+      "type": "object",
+      "properties": {
+        "Enabled": {
+          "type": "boolean"
+        },
+        "Type": {
+          "type": "string"
+        },
+        "Count": {
+          "type": "integer"
+        }
+      },
+      "additionalProperties": false
+    },
+    "NodeOption": {
+      "type": "object",
+      "properties": {
+        "NodeType": {
+          "type": "string",
+          "enum": [
+            "coordinator"
+          ]
+        },
+        "NodeConfig": {
+          "$ref": "#/definitions/NodeConfig"
+        }
+      },
+      "additionalProperties": false
+    },
     "ClusterConfig": {
       "type": "object",
       "additionalProperties": false,
@@ -51,6 +81,12 @@
         },
         "ColdStorageOptions": {
           "$ref": "#/definitions/ColdStorageOptions"
+        },
+        "NodeOptions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NodeOption"
+          }
         }
       }
     },
diff --git a/internal/aws/cfn/schemas/aws/pcs/cluster.json b/internal/aws/cfn/schemas/aws/pcs/cluster.json
index b01920ae..d1449313 100644
--- a/internal/aws/cfn/schemas/aws/pcs/cluster.json
+++ b/internal/aws/cfn/schemas/aws/pcs/cluster.json
@@ -288,7 +288,8 @@
         "pcs:GetCluster",
         "pcs:ListTagsForResource",
         "pcs:TagResource"
-      ]
+      ],
+      "timeoutInMinutes": 60
     },
     "read": {
       "permissions": [
@@ -309,7 +310,8 @@
       "permissions": [
         "pcs:DeleteCluster",
         "pcs:GetCluster"
-      ]
+      ],
+      "timeoutInMinutes": 60
     },
     "list": {
       "permissions": [
diff --git a/internal/aws/cfn/schemas/aws/pcs/queue.json b/internal/aws/cfn/schemas/aws/pcs/queue.json
index 4335bc45..3c083be7 100644
--- a/internal/aws/cfn/schemas/aws/pcs/queue.json
+++ b/internal/aws/cfn/schemas/aws/pcs/queue.json
@@ -121,7 +121,8 @@
         "pcs:GetQueue",
         "pcs:ListTagsForResource",
         "pcs:TagResource"
-      ]
+      ],
+      "timeoutInMinutes": 60
     },
     "read": {
       "permissions": [
@@ -143,7 +144,8 @@
       "permissions": [
         "pcs:DeleteQueue",
         "pcs:GetQueue"
-      ]
+      ],
+      "timeoutInMinutes": 60
     },
     "list": {
       "handlerSchema": {
diff --git a/internal/aws/cfn/schemas/aws/pipes/pipe.json b/internal/aws/cfn/schemas/aws/pipes/pipe.json
index 7faf7c2e..bfbcfb3d 100644
--- a/internal/aws/cfn/schemas/aws/pipes/pipe.json
+++ b/internal/aws/cfn/schemas/aws/pipes/pipe.json
@@ -191,7 +191,7 @@
           "type": "string",
           "maxLength": 1600,
           "minLength": 1,
-          "pattern": "^(^arn:aws([a-z]|\\-)*:logs:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):log-group:.+)$"
+          "pattern": "^(^arn:aws([a-z]|\\-)*:logs:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):log-group:.+)$"
         }
       },
       "additionalProperties": false
@@ -203,7 +203,7 @@
           "type": "string",
           "maxLength": 1600,
           "minLength": 1,
-          "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)$"
+          "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)$"
         }
       },
       "additionalProperties": false
@@ -390,7 +390,7 @@
           "type": "string",
           "maxLength": 1600,
           "minLength": 1,
-          "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$"
+          "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$"
         },
         "InferenceAcceleratorOverrides": {
           "type": "array",
@@ -405,7 +405,7 @@
           "type": "string",
           "maxLength": 1600,
           "minLength": 1,
-          "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$"
+          "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$"
         }
       },
       "additionalProperties": false
@@ -451,7 +451,7 @@
           "type": "string",
           "maxLength": 1600,
           "minLength": 1,
-          "pattern": "^(^arn:aws([a-z]|\\-)*:firehose:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):deliverystream/.+)$"
+          "pattern": "^(^arn:aws([a-z]|\\-)*:firehose:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):deliverystream/.+)$"
         }
       },
       "additionalProperties": false
@@ -509,7 +509,7 @@
               "type": "string",
               "maxLength": 1600,
               "minLength": 1,
-              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
+              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
               "description": "Optional SecretManager ARN which stores the database credentials"
             }
           },
@@ -530,7 +530,7 @@
               "type": "string",
               "maxLength": 1600,
               "minLength": 1,
-              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
+              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
               "description": "Optional SecretManager ARN which stores the database credentials"
             }
           },
@@ -547,7 +547,7 @@
               "type": "string",
               "maxLength": 1600,
               "minLength": 1,
-              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
+              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
               "description": "Optional SecretManager ARN which stores the database credentials"
             }
           },
@@ -962,7 +962,7 @@
           "type": "string",
           "maxLength": 1600,
           "minLength": 1,
-          "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
+          "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
           "description": "Optional SecretManager ARN which stores the database credentials"
         },
         "Vpc": {
@@ -1070,7 +1070,7 @@
           "type": "string",
           "maxLength": 1600,
           "minLength": 1,
-          "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$"
+          "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$"
         },
         "TaskCount": {
           "type": "integer",
@@ -1169,7 +1169,7 @@
             "type": "string",
             "maxLength": 1600,
             "minLength": 1,
-            "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$"
+            "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$"
           },
           "maxItems": 10,
           "minItems": 0
@@ -1286,7 +1286,7 @@
           "type": "string",
           "maxLength": 1600,
           "minLength": 1,
-          "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$",
+          "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)|(\\$(\\.[\\w/_-]+(\\[(\\d+|\\*)\\])*)*)$",
           "description": "Optional SecretManager ARN which stores the database credentials"
         },
         "Database": {
@@ -1550,7 +1550,7 @@
               "type": "string",
               "maxLength": 1600,
               "minLength": 1,
-              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
+              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
               "description": "Optional SecretManager ARN which stores the database credentials"
             }
           },
@@ -1567,7 +1567,7 @@
               "type": "string",
               "maxLength": 1600,
               "minLength": 1,
-              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
+              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
               "description": "Optional SecretManager ARN which stores the database credentials"
             }
           },
@@ -1584,7 +1584,7 @@
               "type": "string",
               "maxLength": 1600,
               "minLength": 1,
-              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
+              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
               "description": "Optional SecretManager ARN which stores the database credentials"
             }
           },
@@ -1601,7 +1601,7 @@
               "type": "string",
               "maxLength": 1600,
               "minLength": 1,
-              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
+              "pattern": "^(^arn:aws([a-z]|\\-)*:secretsmanager:([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1}):(\\d{12}):secret:.+)$",
               "description": "Optional SecretManager ARN which stores the database credentials"
             }
           },
@@ -1741,7 +1741,7 @@
       "type": "string",
       "maxLength": 1600,
       "minLength": 0,
-      "pattern": "^$|arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)$"
+      "pattern": "^$|arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)$"
     },
     "EnrichmentParameters": {
       "$ref": "#/definitions/PipeEnrichmentParameters"
@@ -1774,7 +1774,7 @@
       "type": "string",
       "maxLength": 1600,
       "minLength": 1,
-      "pattern": "^smk://(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]):[0-9]{1,5}|arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)$"
+      "pattern": "^smk://(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9]):[0-9]{1,5}|arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)$"
     },
     "SourceParameters": {
       "$ref": "#/definitions/PipeSourceParameters"
@@ -1792,7 +1792,7 @@
       "type": "string",
       "maxLength": 1600,
       "minLength": 1,
-      "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)$"
+      "pattern": "^arn:(aws[a-zA-Z0-9-]*):([a-zA-Z0-9\\-]+):([a-z]{2}((-gov)|(-iso([a-z]?)))?-[a-z]+-\\d{1})?:(\\d{12})?:(.+)$"
     },
     "TargetParameters": {
       "$ref": "#/definitions/PipeTargetParameters"
diff --git a/internal/aws/cfn/schemas/aws/qbusiness/dataaccessor.json b/internal/aws/cfn/schemas/aws/qbusiness/dataaccessor.json
index ea7203f5..587d53c8 100644
--- a/internal/aws/cfn/schemas/aws/qbusiness/dataaccessor.json
+++ b/internal/aws/cfn/schemas/aws/qbusiness/dataaccessor.json
@@ -212,7 +212,7 @@
     },
     "DisplayName": {
       "type": "string",
-      "maxLength": 1000,
+      "maxLength": 100,
       "minLength": 1,
       "pattern": "^[a-zA-Z0-9][a-zA-Z0-9_-]*$"
     },
@@ -226,7 +226,7 @@
       "type": "string",
       "maxLength": 1284,
       "minLength": 1,
-      "pattern": "^arn:aws:iam::[0-9]{12}:role/.+"
+      "pattern": "^arn:aws:iam::[0-9]{12}:role/[a-zA-Z0-9_/+=,.@-]+$"
     },
     "Tags": {
       "type": "array",
@@ -242,6 +242,7 @@
     }
   },
   "required": [
+    "ApplicationId",
     "ActionConfigurations",
     "DisplayName",
     "Principal"
diff --git a/internal/aws/cfn/schemas/aws/qbusiness/permission.json b/internal/aws/cfn/schemas/aws/qbusiness/permission.json
index 46bcfa6c..52cda180 100644
--- a/internal/aws/cfn/schemas/aws/qbusiness/permission.json
+++ b/internal/aws/cfn/schemas/aws/qbusiness/permission.json
@@ -27,7 +27,7 @@
       "type": "string",
       "maxLength": 1284,
       "minLength": 1,
-      "pattern": "^arn:aws:iam::[0-9]{12}:role/.+"
+      "pattern": "^arn:aws:iam::[0-9]{12}:role/[a-zA-Z0-9_/+=,.@-]+$"
     }
   },
   "required": [
diff --git a/internal/aws/cfn/schemas/aws/quicksight/analysis.json b/internal/aws/cfn/schemas/aws/quicksight/analysis.json
index e6f17ae9..0ad775b2 100644
--- a/internal/aws/cfn/schemas/aws/quicksight/analysis.json
+++ b/internal/aws/cfn/schemas/aws/quicksight/analysis.json
@@ -191,9 +191,7 @@
         "Tooltip": {
           "$ref": "#/definitions/TooltipOptions"
         },
-        "Interactions": {
-          "$ref": "#/definitions/VisualInteractionOptions"
-        },
+        "Interactions": {},
         "WindowOptions": {
           "$ref": "#/definitions/GeospatialWindowOptions"
         },
@@ -4945,9 +4943,7 @@
         "MapStyle": {
           "$ref": "#/definitions/GeospatialMapStyle"
         },
-        "Interactions": {
-          "$ref": "#/definitions/VisualInteractionOptions"
-        },
+        "Interactions": {},
         "MapLayers": {
           "type": "array",
           "items": {
@@ -6130,9 +6126,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "AvailabilityStatus": {
-          "$ref": "#/definitions/DashboardBehavior"
-        }
+        "AvailabilityStatus": {}
       }
     },
     "CategoryDrillDownFilter": {
diff --git a/internal/aws/cfn/schemas/aws/quicksight/custompermissions.json b/internal/aws/cfn/schemas/aws/quicksight/custompermissions.json
new file mode 100644
index 00000000..f48efdea
--- /dev/null
+++ b/internal/aws/cfn/schemas/aws/quicksight/custompermissions.json
@@ -0,0 +1,180 @@
+{
+  "typeName": "AWS::QuickSight::CustomPermissions",
+  "description": "Definition of the AWS::QuickSight::CustomPermissions Resource Type.",
+  "definitions": {
+    "Capabilities": {
+      "type": "object",
+      "properties": {
+        "ExportToCsv": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "ExportToExcel": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "CreateAndUpdateThemes": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "AddOrRunAnomalyDetectionForAnalyses": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "ShareAnalyses": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "CreateAndUpdateDatasets": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "ShareDatasets": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "SubscribeDashboardEmailReports": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "CreateAndUpdateDashboardEmailReports": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "ShareDashboards": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "CreateAndUpdateThresholdAlerts": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "RenameSharedFolders": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "CreateSharedFolders": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "CreateAndUpdateDataSources": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "ShareDataSources": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "ViewAccountSPICECapacity": {
+          "$ref": "#/definitions/CapabilityState"
+        },
+        "CreateSPICEDataset": {
+          "$ref": "#/definitions/CapabilityState"
+        }
+      },
+      "additionalProperties": false
+    },
+    "CapabilityState": {
+      "type": "string",
+      "enum": [
+        "DENY"
+      ]
+    },
+    "Tag": {
+      "type": "object",
+      "description": "<p>The key or keys of the key-value pairs for the resource tag or tags assigned to the\n            resource.</p>",
+      "properties": {
+        "Key": {
+          "type": "string",
+          "maxLength": 128,
+          "minLength": 1,
+          "description": "<p>Tag key.</p>"
+        },
+        "Value": {
+          "type": "string",
+          "maxLength": 256,
+          "minLength": 1,
+          "description": "<p>Tag value.</p>"
+        }
+      },
+      "required": [
+        "Key",
+        "Value"
+      ],
+      "additionalProperties": false
+    }
+  },
+  "properties": {
+    "Arn": {
+      "type": "string"
+    },
+    "AwsAccountId": {
+      "type": "string",
+      "maxLength": 12,
+      "minLength": 12,
+      "pattern": "^[0-9]{12}$"
+    },
+    "Capabilities": {
+      "$ref": "#/definitions/Capabilities"
+    },
+    "CustomPermissionsName": {
+      "type": "string",
+      "maxLength": 64,
+      "minLength": 1,
+      "pattern": "^[a-zA-Z0-9+=,.@_-]+$"
+    },
+    "Tags": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Tag"
+      },
+      "maxItems": 200,
+      "minItems": 1
+    }
+  },
+  "readOnlyProperties": [
+    "/properties/Arn"
+  ],
+  "createOnlyProperties": [
+    "/properties/AwsAccountId",
+    "/properties/CustomPermissionsName"
+  ],
+  "primaryIdentifier": [
+    "/properties/AwsAccountId",
+    "/properties/CustomPermissionsName"
+  ],
+  "handlers": {
+    "create": {
+      "permissions": [
+        "quicksight:CreateCustomPermissions",
+        "quicksight:TagResource"
+      ]
+    },
+    "read": {
+      "permissions": [
+        "quicksight:DescribeCustomPermissions",
+        "quicksight:ListTagsForResource"
+      ]
+    },
+    "update": {
+      "permissions": [
+        "quicksight:UpdateCustomPermissions",
+        "quicksight:TagResource",
+        "quicksight:UntagResource",
+        "quicksight:ListTagsForResource"
+      ]
+    },
+    "delete": {
+      "permissions": [
+        "quicksight:DeleteCustomPermissions"
+      ]
+    },
+    "list": {
+      "permissions": [
+        "quicksight:ListCustomPermissions"
+      ]
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "AwsAccountId",
+    "CustomPermissionsName"
+  ],
+  "tagging": {
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "cloudFormationSystemTags": false,
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "quicksight:TagResource",
+      "quicksight:UntagResource",
+      "quicksight:ListTagsForResource"
+    ]
+  }
+}
diff --git a/internal/aws/cfn/schemas/aws/quicksight/dashboard.json b/internal/aws/cfn/schemas/aws/quicksight/dashboard.json
index a67bd26b..c746eeab 100644
--- a/internal/aws/cfn/schemas/aws/quicksight/dashboard.json
+++ b/internal/aws/cfn/schemas/aws/quicksight/dashboard.json
@@ -173,9 +173,7 @@
         "Tooltip": {
           "$ref": "#/definitions/TooltipOptions"
         },
-        "Interactions": {
-          "$ref": "#/definitions/VisualInteractionOptions"
-        },
+        "Interactions": {},
         "WindowOptions": {
           "$ref": "#/definitions/GeospatialWindowOptions"
         },
@@ -2455,9 +2453,7 @@
         "VisualPublishOptions": {
           "$ref": "#/definitions/DashboardVisualPublishOptions"
         },
-        "VisualMenuOption": {
-          "$ref": "#/definitions/VisualMenuOption"
-        },
+        "VisualMenuOption": {},
         "DataPointTooltipOption": {
           "$ref": "#/definitions/DataPointTooltipOption"
         },
@@ -5077,9 +5073,7 @@
         "MapStyle": {
           "$ref": "#/definitions/GeospatialMapStyle"
         },
-        "Interactions": {
-          "$ref": "#/definitions/VisualInteractionOptions"
-        },
+        "Interactions": {},
         "MapLayers": {
           "type": "array",
           "items": {
diff --git a/internal/aws/cfn/schemas/aws/quicksight/dataset.json b/internal/aws/cfn/schemas/aws/quicksight/dataset.json
index e0af376f..e1d0cc74 100644
--- a/internal/aws/cfn/schemas/aws/quicksight/dataset.json
+++ b/internal/aws/cfn/schemas/aws/quicksight/dataset.json
@@ -670,9 +670,7 @@
             "$ref": "#/definitions/InputColumn"
           }
         },
-        "UploadSettings": {
-          "$ref": "#/definitions/UploadSettings"
-        }
+        "UploadSettings": {}
       },
       "required": [
         "DataSourceArn",
diff --git a/internal/aws/cfn/schemas/aws/quicksight/template.json b/internal/aws/cfn/schemas/aws/quicksight/template.json
index ef2b4482..ca816c6b 100644
--- a/internal/aws/cfn/schemas/aws/quicksight/template.json
+++ b/internal/aws/cfn/schemas/aws/quicksight/template.json
@@ -104,9 +104,7 @@
         "TotalCellStyle": {
           "$ref": "#/definitions/TableCellStyle"
         },
-        "TotalsVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "TotalsVisibility": {},
         "MetricHeaderCellStyle": {
           "$ref": "#/definitions/TableCellStyle"
         }
@@ -173,9 +171,7 @@
         "Symbol": {
           "$ref": "#/definitions/NumericSeparatorSymbol"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "PredefinedHierarchy": {
@@ -348,9 +344,7 @@
         "LineStyle": {
           "$ref": "#/definitions/LineChartLineStyle"
         },
-        "LineVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "LineVisibility": {},
         "LineWidth": {
           "description": "String based length that is composed of value and unit in px",
           "type": "string"
@@ -504,9 +498,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "MissingDateVisibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "MissingDateVisibility": {}
       }
     },
     "KPIActualValueConditionalFormatting": {
@@ -594,12 +586,8 @@
           "description": "String based length that is composed of value and unit in px",
           "type": "string"
         },
-        "AxisLineVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "GridLineVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "AxisLineVisibility": {},
+        "GridLineVisibility": {},
         "ScrollbarOptions": {
           "$ref": "#/definitions/ScrollBarOptions"
         }
@@ -614,9 +602,7 @@
           "type": "string",
           "maxLength": 512
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "FieldValue": {
           "minLength": 0,
           "type": "string",
@@ -897,9 +883,7 @@
           "type": "string",
           "maxLength": 512
         },
-        "ChartConfiguration": {
-          "$ref": "#/definitions/GeospatialLayerMapConfiguration"
-        },
+        "ChartConfiguration": {},
         "DataSetIdentifier": {
           "minLength": 1,
           "type": "string",
@@ -1337,9 +1321,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "TooltipTarget": {
@@ -1556,9 +1538,7 @@
           "type": "string",
           "maxLength": 1024
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "WordCloudOptions": {
@@ -1647,9 +1627,7 @@
           "type": "string",
           "maxLength": 512
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "Width": {
           "description": "String based length that is composed of value and unit in px",
           "type": "string"
@@ -1718,9 +1696,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "FormatText": {
           "$ref": "#/definitions/LongFormatText"
         }
@@ -2290,27 +2266,19 @@
             "$ref": "#/definitions/DataLabelType"
           }
         },
-        "MeasureLabelVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "MeasureLabelVisibility": {},
         "Position": {
           "$ref": "#/definitions/DataLabelPosition"
         },
         "LabelContent": {
           "$ref": "#/definitions/DataLabelContent"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "TotalsVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
+        "TotalsVisibility": {},
         "Overlap": {
           "$ref": "#/definitions/DataLabelOverlap"
         },
-        "CategoryLabelVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "CategoryLabelVisibility": {},
         "LabelColor": {
           "pattern": "^#[A-F0-9]{6}$",
           "type": "string"
@@ -2429,9 +2397,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "TooltipText": {
           "$ref": "#/definitions/SheetImageTooltipText"
         }
@@ -2537,12 +2503,8 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "OverflowColumnHeaderVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "VerticalOverflowVisibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "OverflowColumnHeaderVisibility": {},
+        "VerticalOverflowVisibility": {}
       }
     },
     "EmptyVisual": {
@@ -2585,12 +2547,8 @@
           "pattern": "^#[A-F0-9]{6}$",
           "type": "string"
         },
-        "TooltipVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "TooltipVisibility": {},
+        "Visibility": {}
       },
       "required": [
         "Type"
@@ -2719,9 +2677,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "AxisDisplayDataDrivenRange": {
@@ -2866,9 +2822,7 @@
         "VisibleRange": {
           "$ref": "#/definitions/VisibleRangeOptions"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "ConditionalFormattingCustomIconOptions": {
@@ -3457,9 +3411,7 @@
           "description": "String based length that is composed of value and unit in px",
           "type": "string"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "RenderingRules": {
           "minItems": 0,
           "maxItems": 10000,
@@ -3836,9 +3788,7 @@
           "pattern": "^#[A-F0-9]{6}(?:[A-F0-9]{2})?$",
           "type": "string"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "SheetImageScalingType": {
@@ -3881,9 +3831,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "ValidationStrategy": {
@@ -3949,9 +3897,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "FontConfiguration": {
           "$ref": "#/definitions/FontConfiguration"
         },
@@ -4071,9 +4017,7 @@
           "pattern": "^#[A-F0-9]{6}(?:[A-F0-9]{2})?$",
           "type": "string"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "CategoryFilter": {
@@ -4726,9 +4670,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "CircleSymbolStyle": {
-          "$ref": "#/definitions/GeospatialCircleSymbolStyle"
-        }
+        "CircleSymbolStyle": {}
       }
     },
     "HorizontalTextAlignment": {
@@ -4847,18 +4789,14 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "DonutCenterOptions": {
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "LabelVisibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "LabelVisibility": {}
       }
     },
     "BodySectionContent": {
@@ -5369,9 +5307,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "NumericFilterSelectAllOptions": {
@@ -5390,9 +5326,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "SheetControlLayoutConfiguration": {
@@ -5463,9 +5397,7 @@
         "TotalCellStyle": {
           "$ref": "#/definitions/TableCellStyle"
         },
-        "TotalsVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "TotalsVisibility": {},
         "FieldLevel": {
           "$ref": "#/definitions/PivotTableSubtotalLevel"
         },
@@ -5486,12 +5418,8 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "OverflowColumnHeaderVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "VerticalOverflowVisibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "OverflowColumnHeaderVisibility": {},
+        "VerticalOverflowVisibility": {}
       }
     },
     "TableOrientation": {
@@ -5967,9 +5895,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "AvailabilityStatus": {
-          "$ref": "#/definitions/DashboardBehavior"
-        }
+        "AvailabilityStatus": {}
       }
     },
     "CategoryDrillDownFilter": {
@@ -6292,18 +6218,12 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "MeasureLabelVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "MeasureLabelVisibility": {},
         "Position": {
           "$ref": "#/definitions/DataLabelPosition"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "CategoryLabelVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
+        "CategoryLabelVisibility": {},
         "LabelColor": {
           "pattern": "^#[A-F0-9]{6}$",
           "type": "string"
@@ -6327,9 +6247,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "HeaderFooterSectionConfiguration": {
@@ -6659,12 +6577,8 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "SortIconVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
+        "SortIconVisibility": {},
         "AxisLabelOptions": {
           "minItems": 0,
           "maxItems": 100,
@@ -6993,9 +6907,7 @@
         "RowHeaderStyle": {
           "$ref": "#/definitions/TableCellStyle"
         },
-        "CollapsedRowDimensionsVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "CollapsedRowDimensionsVisibility": {},
         "RowsLayout": {
           "$ref": "#/definitions/PivotTableRowsLayout"
         },
@@ -7006,21 +6918,15 @@
           "description": "String based length that is composed of value and unit in px",
           "type": "string"
         },
-        "ColumnNamesVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "ColumnNamesVisibility": {},
         "RowsLabelOptions": {
           "$ref": "#/definitions/PivotTableRowsLabelOptions"
         },
-        "SingleMetricVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "SingleMetricVisibility": {},
         "ColumnHeaderStyle": {
           "$ref": "#/definitions/TableCellStyle"
         },
-        "ToggleButtonsVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "ToggleButtonsVisibility": {},
         "CellStyle": {
           "$ref": "#/definitions/TableCellStyle"
         },
@@ -7237,9 +7143,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "InfoIconText": {
           "minLength": 1,
           "type": "string",
@@ -7793,9 +7697,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "CategoryFilterConfiguration": {
@@ -7818,9 +7720,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "State": {
-          "$ref": "#/definitions/GeospatialColorState"
-        },
+        "State": {},
         "Color": {
           "pattern": "^#[A-F0-9]{6}(?:[A-F0-9]{2})?$",
           "type": "string"
@@ -7971,9 +7871,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "LegendOptions": {
@@ -7989,9 +7887,7 @@
         "Title": {
           "$ref": "#/definitions/LabelOptions"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "Height": {
           "description": "String based length that is composed of value and unit in px",
           "type": "string"
@@ -8248,9 +8144,7 @@
         "VerticalTextAlignment": {
           "$ref": "#/definitions/VerticalTextAlignment"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "Height": {
           "maximum": 500,
           "type": "number",
@@ -8386,9 +8280,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "TotalOptions": {
@@ -8415,9 +8307,7 @@
         "TotalCellStyle": {
           "$ref": "#/definitions/TableCellStyle"
         },
-        "TotalsVisibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "TotalsVisibility": {}
       }
     },
     "ForecastScenario": {
@@ -8485,9 +8375,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "DonutOptions": {
@@ -9190,9 +9078,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "UniqueValuesComputation": {
@@ -9242,9 +9128,7 @@
         "CustomLabel": {
           "type": "string"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "FontConfiguration": {
           "$ref": "#/definitions/FontConfiguration"
         }
@@ -9350,9 +9234,7 @@
         "Label": {
           "type": "string"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       },
       "required": [
         "FieldId"
@@ -9393,9 +9275,7 @@
           "description": "String based length that is composed of value and unit in px",
           "type": "string"
         },
-        "MarkerVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "MarkerVisibility": {},
         "MarkerColor": {
           "pattern": "^#[A-F0-9]{6}$",
           "type": "string"
@@ -10054,9 +9934,7 @@
           "type": "string",
           "maxLength": 512
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       }
     },
     "SpatialStaticFile": {
@@ -10179,9 +10057,7 @@
           "type": "string",
           "maxLength": 512
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       },
       "required": [
         "FieldId"
@@ -10630,9 +10506,7 @@
         "Label": {
           "type": "string"
         },
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "Visibility": {}
       },
       "required": [
         "Column"
@@ -10923,9 +10797,7 @@
         "SelectedTooltipType": {
           "$ref": "#/definitions/SelectedTooltipType"
         },
-        "TooltipVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "TooltipVisibility": {},
         "FieldBasedTooltip": {
           "$ref": "#/definitions/FieldBasedTooltip"
         }
@@ -10943,9 +10815,7 @@
             "$ref": "#/definitions/TooltipItem"
           }
         },
-        "AggregationVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "AggregationVisibility": {},
         "TooltipTitleType": {
           "$ref": "#/definitions/TooltipTitleType"
         }
@@ -11345,15 +11215,9 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "FillColor": {
-          "$ref": "#/definitions/GeospatialColor"
-        },
-        "StrokeWidth": {
-          "$ref": "#/definitions/GeospatialLineWidth"
-        },
-        "StrokeColor": {
-          "$ref": "#/definitions/GeospatialColor"
-        }
+        "FillColor": {},
+        "StrokeWidth": {},
+        "StrokeColor": {}
       }
     },
     "DataSetConfiguration": {
@@ -11549,9 +11413,7 @@
         "VisualPalette": {
           "$ref": "#/definitions/VisualPalette"
         },
-        "AlternateBandColorsVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "AlternateBandColorsVisibility": {},
         "StartAngle": {
           "maximum": 360,
           "type": "number",
@@ -11580,9 +11442,7 @@
       "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Visibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "Visibility": {},
         "FormatText": {
           "$ref": "#/definitions/ShortFormatText"
         }
@@ -11934,12 +11794,8 @@
           "description": "String based length that is composed of value and unit in px",
           "type": "string"
         },
-        "BackgroundVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "BorderVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "BackgroundVisibility": {},
+        "BorderVisibility": {},
         "BorderColor": {
           "pattern": "^#[A-F0-9]{6}(?:[A-F0-9]{2})?$",
           "type": "string"
@@ -11947,9 +11803,7 @@
         "Title": {
           "$ref": "#/definitions/PanelTitleOptions"
         },
-        "GutterVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
+        "GutterVisibility": {},
         "BackgroundColor": {
           "pattern": "^#[A-F0-9]{6}(?:[A-F0-9]{2})?$",
           "type": "string"
@@ -12100,12 +11954,8 @@
         "StyleOptions": {
           "$ref": "#/definitions/BoxPlotStyleOptions"
         },
-        "OutlierVisibility": {
-          "$ref": "#/definitions/Visibility"
-        },
-        "AllDataPointsVisibility": {
-          "$ref": "#/definitions/Visibility"
-        }
+        "OutlierVisibility": {},
+        "AllDataPointsVisibility": {}
       }
     },
     "KPIPrimaryValueConditionalFormatting": {
diff --git a/internal/aws/cfn/schemas/aws/rds/dbcluster.json b/internal/aws/cfn/schemas/aws/rds/dbcluster.json
index 7231e3b6..472ce4bb 100644
--- a/internal/aws/cfn/schemas/aws/rds/dbcluster.json
+++ b/internal/aws/cfn/schemas/aws/rds/dbcluster.json
@@ -32,7 +32,7 @@
       }
     },
     "AutoMinorVersionUpgrade": {
-      "description": "Specifies whether minor engine upgrades are applied automatically to the DB cluster during the maintenance window. By default, minor engine upgrades are applied automatically.\n Valid for Cluster Type: Multi-AZ DB clusters only",
+      "description": "Specifies whether minor engine upgrades are applied automatically to the DB cluster during the maintenance window. By default, minor engine upgrades are applied automatically.\n Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB cluster",
       "type": "boolean"
     },
     "BacktrackWindow": {
@@ -54,6 +54,10 @@
       "description": "A value that indicates whether to copy all tags from the DB cluster to snapshots of the DB cluster. The default is not to copy them.\n Valid for: Aurora DB clusters and Multi-AZ DB clusters",
       "type": "boolean"
     },
+    "DatabaseInsightsMode": {
+      "description": "The mode of Database Insights to enable for the DB cluster.\n If you set this value to ``advanced``, you must also set the ``PerformanceInsightsEnabled`` parameter to ``true`` and the ``PerformanceInsightsRetentionPeriod`` parameter to 465.\n Valid for Cluster Type: Aurora DB clusters only",
+      "type": "string"
+    },
     "DatabaseName": {
       "description": "The name of your database. If you don't provide a name, then Amazon RDS won't create a database in this DB cluster. For naming constraints, see [Naming Constraints](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/CHAP_Limits.html#RDS_Limits.Constraints) in the *Amazon Aurora User Guide*. \n Valid for: Aurora DB clusters and Multi-AZ DB clusters",
       "type": "string"
@@ -125,7 +129,7 @@
       "type": "boolean"
     },
     "EnableHttpEndpoint": {
-      "description": "Specifies whether to enable the HTTP endpoint for the DB cluster. By default, the HTTP endpoint isn't enabled.\n When enabled, the HTTP endpoint provides a connectionless web service API (RDS Data API) for running SQL queries on the DB cluster. You can also query your database from inside the RDS console with the RDS query editor.\n RDS Data API is supported with the following DB clusters:\n  +  Aurora PostgreSQL Serverless v2 and provisioned\n  +  Aurora PostgreSQL and Aurora MySQL Serverless v1\n  \n For more information, see [Using RDS Data API](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html) in the *Amazon Aurora User Guide*.\n Valid for Cluster Type: Aurora DB clusters only",
+      "description": "Specifies whether to enable the HTTP endpoint for the DB cluster. By default, the HTTP endpoint isn't enabled.\n When enabled, the HTTP endpoint provides a connectionless web service API (RDS Data API) for running SQL queries on the DB cluster. You can also query your database from inside the RDS console with the RDS query editor.\n For more information, see [Using RDS Data API](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html) in the *Amazon Aurora User Guide*.\n Valid for Cluster Type: Aurora DB clusters only",
       "type": "boolean"
     },
     "EnableIAMDatabaseAuthentication": {
@@ -176,14 +180,14 @@
     },
     "MasterUserSecret": {
       "$ref": "#/definitions/MasterUserSecret",
-      "description": "The secret managed by RDS in AWS Secrets Manager for the master user password.\n For more information, see [Password management with Secrets Manager](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-secrets-manager.html) in the *Amazon RDS User Guide* and [Password management with Secrets Manager](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/rds-secrets-manager.html) in the *Amazon Aurora User Guide.*"
+      "description": "The secret managed by RDS in AWS Secrets Manager for the master user password.\n  When you restore a DB cluster from a snapshot, Amazon RDS generates a new secret instead of reusing the secret specified in the ``SecretArn`` property. This ensures that the restored DB cluster is securely managed with a dedicated secret. To maintain consistent integration with your application, you might need to update resource configurations to reference the newly created secret.\n  For more information, see [Password management with Secrets Manager](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-secrets-manager.html) in the *Amazon RDS User Guide* and [Password management with Secrets Manager](https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/rds-secrets-manager.html) in the *Amazon Aurora User Guide.*"
     },
     "MonitoringInterval": {
-      "description": "The interval, in seconds, between points when Enhanced Monitoring metrics are collected for the DB cluster. To turn off collecting Enhanced Monitoring metrics, specify ``0``.\n If ``MonitoringRoleArn`` is specified, also set ``MonitoringInterval`` to a value other than ``0``.\n Valid for Cluster Type: Multi-AZ DB clusters only\n Valid Values: ``0 | 1 | 5 | 10 | 15 | 30 | 60`` \n Default: ``0``",
+      "description": "The interval, in seconds, between points when Enhanced Monitoring metrics are collected for the DB cluster. To turn off collecting Enhanced Monitoring metrics, specify ``0``.\n If ``MonitoringRoleArn`` is specified, also set ``MonitoringInterval`` to a value other than ``0``.\n Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters\n Valid Values: ``0 | 1 | 5 | 10 | 15 | 30 | 60`` \n Default: ``0``",
       "type": "integer"
     },
     "MonitoringRoleArn": {
-      "description": "The Amazon Resource Name (ARN) for the IAM role that permits RDS to send Enhanced Monitoring metrics to Amazon CloudWatch Logs. An example is ``arn:aws:iam:123456789012:role/emaccess``. For information on creating a monitoring role, see [Setting up and enabling Enhanced Monitoring](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling) in the *Amazon RDS User Guide*.\n If ``MonitoringInterval`` is set to a value other than ``0``, supply a ``MonitoringRoleArn`` value.\n Valid for Cluster Type: Multi-AZ DB clusters only",
+      "description": "The Amazon Resource Name (ARN) for the IAM role that permits RDS to send Enhanced Monitoring metrics to Amazon CloudWatch Logs. An example is ``arn:aws:iam:123456789012:role/emaccess``. For information on creating a monitoring role, see [Setting up and enabling Enhanced Monitoring](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling) in the *Amazon RDS User Guide*.\n If ``MonitoringInterval`` is set to a value other than ``0``, supply a ``MonitoringRoleArn`` value.\n Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters",
       "type": "string"
     },
     "NetworkType": {
@@ -191,15 +195,15 @@
       "type": "string"
     },
     "PerformanceInsightsEnabled": {
-      "description": "Specifies whether to turn on Performance Insights for the DB cluster.\n For more information, see [Using Amazon Performance Insights](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.html) in the *Amazon RDS User Guide*.\n Valid for Cluster Type: Multi-AZ DB clusters only",
+      "description": "Specifies whether to turn on Performance Insights for the DB cluster.\n For more information, see [Using Amazon Performance Insights](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.html) in the *Amazon RDS User Guide*.\n Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters",
       "type": "boolean"
     },
     "PerformanceInsightsKmsKeyId": {
-      "description": "The AWS KMS key identifier for encryption of Performance Insights data.\n The AWS KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key.\n If you don't specify a value for ``PerformanceInsightsKMSKeyId``, then Amazon RDS uses your default KMS key. There is a default KMS key for your AWS-account. Your AWS-account has a different default KMS key for each AWS-Region.\n Valid for Cluster Type: Multi-AZ DB clusters only",
+      "description": "The AWS KMS key identifier for encryption of Performance Insights data.\n The AWS KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key.\n If you don't specify a value for ``PerformanceInsightsKMSKeyId``, then Amazon RDS uses your default KMS key. There is a default KMS key for your AWS-account. Your AWS-account has a different default KMS key for each AWS-Region.\n Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters",
       "type": "string"
     },
     "PerformanceInsightsRetentionPeriod": {
-      "description": "The number of days to retain Performance Insights data.\n Valid for Cluster Type: Multi-AZ DB clusters only\n Valid Values:\n  +   ``7`` \n  +   *month* * 31, where *month* is a number of months from 1-23. Examples: ``93`` (3 months * 31), ``341`` (11 months * 31), ``589`` (19 months * 31)\n  +   ``731`` \n  \n Default: ``7`` days\n If you specify a retention period that isn't valid, such as ``94``, Amazon RDS issues an error.",
+      "description": "The number of days to retain Performance Insights data.\n Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters\n Valid Values:\n  +   ``7`` \n  +   *month* * 31, where *month* is a number of months from 1-23. Examples: ``93`` (3 months * 31), ``341`` (11 months * 31), ``589`` (19 months * 31)\n  +   ``731`` \n  \n Default: ``7`` days\n If you specify a retention period that isn't valid, such as ``94``, Amazon RDS issues an error.",
       "type": "integer"
     },
     "Port": {
@@ -345,7 +349,7 @@
         },
         "SecondsUntilAutoPause": {
           "type": "integer",
-          "description": ""
+          "description": "Specifies the number of seconds an Aurora Serverless v2 DB instance must be idle before Aurora attempts to automatically pause it. \n Specify a value between 300 seconds (five minutes) and 86,400 seconds (one day). The default is 300 seconds."
         }
       }
     },
diff --git a/internal/aws/cfn/schemas/aws/rds/dbinstance.json b/internal/aws/cfn/schemas/aws/rds/dbinstance.json
index b0806a25..0915a2fe 100644
--- a/internal/aws/cfn/schemas/aws/rds/dbinstance.json
+++ b/internal/aws/cfn/schemas/aws/rds/dbinstance.json
@@ -176,6 +176,10 @@
       "type": "string",
       "description": "The instance profile associated with the underlying Amazon EC2 instance of an RDS Custom DB instance.\n This setting is required for RDS Custom.\n Constraints:\n  +  The profile must exist in your account.\n  +  The profile must have an IAM role that Amazon EC2 has permissions to assume.\n  +  The instance profile name and the associated IAM role name must start with the prefix ``AWSRDSCustom``.\n  \n For the list of permissions required for the IAM role, see [Configure IAM and your VPC](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc) in the *Amazon RDS User Guide*."
     },
+    "DatabaseInsightsMode": {
+      "description": "",
+      "type": "string"
+    },
     "DBClusterIdentifier": {
       "type": "string",
       "description": "The identifier of the DB cluster that this DB instance will belong to.\n This setting doesn't apply to RDS Custom DB instances."
@@ -560,7 +564,8 @@
     "/properties/DBInstanceArn",
     "/properties/MasterUserSecret/SecretArn",
     "/properties/CertificateDetails/CAIdentifier",
-    "/properties/CertificateDetails/ValidTill"
+    "/properties/CertificateDetails/ValidTill",
+    "/properties/DatabaseInsightsMode"
   ],
   "primaryIdentifier": [
     "/properties/DBInstanceIdentifier"
diff --git a/internal/aws/cfn/schemas/aws/redshift/integration.json b/internal/aws/cfn/schemas/aws/redshift/integration.json
index d1da8990..4a42183f 100644
--- a/internal/aws/cfn/schemas/aws/redshift/integration.json
+++ b/internal/aws/cfn/schemas/aws/redshift/integration.json
@@ -15,11 +15,11 @@
     },
     "SourceArn": {
       "type": "string",
-      "description": "The Amazon Resource Name (ARN) of the database to use as the source for replication, for example, arn:aws:dynamodb:us-east-2:123412341234:table/dynamotable"
+      "description": "The Amazon Resource Name (ARN) of the database to use as the source for replication"
     },
     "TargetArn": {
       "type": "string",
-      "description": "The Amazon Resource Name (ARN) of the Redshift data warehouse to use as the target for replication, for example, arn:aws:redshift:us-east-2:123412341234:namespace:e43aab3e-10a3-4ec4-83d4-f227ff9bfbcf"
+      "description": "The Amazon Resource Name (ARN) of the Redshift data warehouse to use as the target for replication"
     },
     "Tags": {
       "type": "array",
@@ -37,21 +37,7 @@
     },
     "KMSKeyId": {
       "type": "string",
-      "description": "An KMS key identifier for the key to use to encrypt the integration. If you don't specify an encryption key, the default AWS owned KMS key is used.",
-      "anyOf": [
-        {
-          "relationshipRef": {
-            "typeName": "AWS::KMS::Key",
-            "propertyPath": "/properties/Arn"
-          }
-        },
-        {
-          "relationshipRef": {
-            "typeName": "AWS::KMS::Key",
-            "propertyPath": "/properties/KeyId"
-          }
-        }
-      ]
+      "description": "An KMS key identifier for the key to use to encrypt the integration. If you don't specify an encryption key, the default AWS owned KMS key is used."
     },
     "AdditionalEncryptionContext": {
       "$ref": "#/definitions/EncryptionContextMap"
@@ -103,7 +89,7 @@
           "minLength": 0
         }
       },
-      "description": "An optional set of non-secret key?value pairs that contains additional contextual information about the data.",
+      "description": "An optional set of non-secret key–value pairs that contains additional contextual information about the data.",
       "additionalProperties": false
     }
   },
@@ -131,9 +117,10 @@
         "redshift:CreateTags",
         "redshift:DescribeTags",
         "redshift:DescribeClusters",
+        "redshift:CreateInboundIntegration",
+        "redshift-serverless:ListNamespaces",
         "kms:CreateGrant",
-        "kms:DescribeKey",
-        "redshift:CreateInboundIntegration"
+        "kms:DescribeKey"
       ]
     },
     "read": {
@@ -149,7 +136,8 @@
         "redshift:CreateTags",
         "redshift:DeleteTags",
         "redshift:DescribeClusters",
-        "redshift:DescribeTags"
+        "redshift:DescribeTags",
+        "redshift-serverless:ListNamespaces"
       ]
     },
     "delete": {
diff --git a/internal/aws/cfn/schemas/aws/refactorspaces/application.json b/internal/aws/cfn/schemas/aws/refactorspaces/application.json
index 04248e91..e6e12462 100644
--- a/internal/aws/cfn/schemas/aws/refactorspaces/application.json
+++ b/internal/aws/cfn/schemas/aws/refactorspaces/application.json
@@ -189,10 +189,6 @@
         "apigateway:POST",
         "apigateway:PUT",
         "apigateway:UpdateRestApiPolicy",
-        "apigateway:Update*",
-        "apigateway:Delete*",
-        "apigateway:Get*",
-        "apigateway:Put*",
         "elasticloadbalancing:CreateLoadBalancer",
         "elasticloadbalancing:DescribeLoadBalancers",
         "elasticloadbalancing:DescribeTags",
@@ -220,10 +216,10 @@
         "ec2:DeleteTags",
         "ec2:RevokeSecurityGroupIngress",
         "elasticloadbalancing:DeleteLoadBalancer",
-        "apigateway:Update*",
-        "apigateway:Delete*",
-        "apigateway:Get*",
-        "apigateway:Put*"
+        "apigateway:DELETE",
+        "apigateway:GET",
+        "apigateway:PUT",
+        "apigateway:UpdateRestApiPolicy"
       ]
     },
     "list": {
diff --git a/internal/aws/cfn/schemas/aws/refactorspaces/service.json b/internal/aws/cfn/schemas/aws/refactorspaces/service.json
index b96c5a8a..f2512dd6 100644
--- a/internal/aws/cfn/schemas/aws/refactorspaces/service.json
+++ b/internal/aws/cfn/schemas/aws/refactorspaces/service.json
@@ -186,7 +186,7 @@
     },
     "read": {
       "permissions": [
-        "refactor-spacess:GetService",
+        "refactor-spaces:GetService",
         "refactor-spaces:ListTagsForResource"
       ]
     },
diff --git a/internal/aws/cfn/schemas/aws/resiliencehub/app.json b/internal/aws/cfn/schemas/aws/resiliencehub/app.json
index 61116c2e..336acf72 100644
--- a/internal/aws/cfn/schemas/aws/resiliencehub/app.json
+++ b/internal/aws/cfn/schemas/aws/resiliencehub/app.json
@@ -162,6 +162,11 @@
       "description": "Amazon Resource Name (ARN) of the Resiliency Policy.",
       "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$"
     },
+    "RegulatoryPolicyArn": {
+      "type": "string",
+      "description": "Amazon Resource Name (ARN) of the Regulatory Policy.",
+      "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$"
+    },
     "Tags": {
       "$ref": "#/definitions/TagMap"
     },
@@ -216,7 +221,12 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "resiliencehub:TagResource",
+      "resiliencehub:ListTagsForResource",
+      "resiliencehub:UntagResource"
+    ]
   },
   "additionalProperties": false,
   "required": [
@@ -256,7 +266,17 @@
         "sns:GetTopicAttributes",
         "route53:List*",
         "iam:PassRole",
-        "resiliencehub:*"
+        "resiliencehub:CreateApp",
+        "resiliencehub:DescribeApp",
+        "resiliencehub:DescribeAppVersionTemplate",
+        "resiliencehub:PutDraftAppVersionTemplate",
+        "resiliencehub:AddDraftAppVersionResourceMappings",
+        "resiliencehub:ListAppVersionResourceMappings",
+        "resiliencehub:ListAppVersions",
+        "resiliencehub:PublishAppVersion",
+        "resiliencehub:ListTagsForResource",
+        "resiliencehub:TagResource",
+        "resiliencehub:UntagResource"
       ]
     },
     "read": {
@@ -289,7 +309,18 @@
         "sns:GetTopicAttributes",
         "route53:List*",
         "iam:PassRole",
-        "resiliencehub:*"
+        "resiliencehub:UpdateApp",
+        "resiliencehub:DescribeApp",
+        "resiliencehub:DescribeAppVersionTemplate",
+        "resiliencehub:PutDraftAppVersionTemplate",
+        "resiliencehub:AddDraftAppVersionResourceMappings",
+        "resiliencehub:RemoveDraftAppVersionResourceMappings",
+        "resiliencehub:ListAppVersionResourceMappings",
+        "resiliencehub:ListAppVersions",
+        "resiliencehub:PublishAppVersion",
+        "resiliencehub:ListTagsForResource",
+        "resiliencehub:TagResource",
+        "resiliencehub:UntagResource"
       ]
     },
     "delete": {
diff --git a/internal/aws/cfn/schemas/aws/resiliencehub/resiliencypolicy.json b/internal/aws/cfn/schemas/aws/resiliencehub/resiliencypolicy.json
index cbd4f867..af87710b 100644
--- a/internal/aws/cfn/schemas/aws/resiliencehub/resiliencypolicy.json
+++ b/internal/aws/cfn/schemas/aws/resiliencehub/resiliencypolicy.json
@@ -107,7 +107,12 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "resiliencehub:TagResource",
+      "resiliencehub:ListTagsForResource",
+      "resiliencehub:UntagResource"
+    ]
   },
   "additionalProperties": false,
   "required": [
diff --git a/internal/aws/cfn/schemas/aws/rolesanywhere/crl.json b/internal/aws/cfn/schemas/aws/rolesanywhere/crl.json
index f5a7b605..1671bd90 100644
--- a/internal/aws/cfn/schemas/aws/rolesanywhere/crl.json
+++ b/internal/aws/cfn/schemas/aws/rolesanywhere/crl.json
@@ -55,7 +55,12 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "rolesanywhere:UntagResource",
+      "rolesanywhere:TagResource",
+      "rolesanywhere:ListTagsForResource"
+    ]
   },
   "required": [
     "Name",
diff --git a/internal/aws/cfn/schemas/aws/rolesanywhere/profile.json b/internal/aws/cfn/schemas/aws/rolesanywhere/profile.json
index 937aa33d..9cb0a13f 100644
--- a/internal/aws/cfn/schemas/aws/rolesanywhere/profile.json
+++ b/internal/aws/cfn/schemas/aws/rolesanywhere/profile.json
@@ -124,12 +124,23 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "rolesanywhere:UntagResource",
+      "rolesanywhere:TagResource",
+      "rolesanywhere:ListTagsForResource"
+    ]
   },
+  "createOnlyProperties": [
+    "/properties/RequireInstanceProperties"
+  ],
   "readOnlyProperties": [
     "/properties/ProfileId",
     "/properties/ProfileArn"
   ],
+  "writeOnlyProperties": [
+    "/properties/RequireInstanceProperties"
+  ],
   "primaryIdentifier": [
     "/properties/ProfileId"
   ],
diff --git a/internal/aws/cfn/schemas/aws/rolesanywhere/trustanchor.json b/internal/aws/cfn/schemas/aws/rolesanywhere/trustanchor.json
index b6bb7850..a1a6b5ac 100644
--- a/internal/aws/cfn/schemas/aws/rolesanywhere/trustanchor.json
+++ b/internal/aws/cfn/schemas/aws/rolesanywhere/trustanchor.json
@@ -150,7 +150,12 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "rolesanywhere:UntagResource",
+      "rolesanywhere:TagResource",
+      "rolesanywhere:ListTagsForResource"
+    ]
   },
   "required": [
     "Name",
diff --git a/internal/aws/cfn/schemas/aws/s3/accesspoint.json b/internal/aws/cfn/schemas/aws/s3/accesspoint.json
index e9e62c32..0fc4a396 100644
--- a/internal/aws/cfn/schemas/aws/s3/accesspoint.json
+++ b/internal/aws/cfn/schemas/aws/s3/accesspoint.json
@@ -148,5 +148,8 @@
       ]
     }
   },
+  "tagging": {
+    "taggable": false
+  },
   "additionalProperties": false
 }
diff --git a/internal/aws/cfn/schemas/aws/sagemaker/cluster.json b/internal/aws/cfn/schemas/aws/sagemaker/cluster.json
index c64c59ff..cf9596ea 100644
--- a/internal/aws/cfn/schemas/aws/sagemaker/cluster.json
+++ b/internal/aws/cfn/schemas/aws/sagemaker/cluster.json
@@ -1,187 +1,259 @@
 {
+  "tagging": {
+    "permissions": [
+      "sagemaker:AddTags",
+      "sagemaker:ListTags",
+      "sagemaker:DeleteTags"
+    ],
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "tagProperty": "/properties/Tags",
+    "cloudFormationSystemTags": false
+  },
+  "handlers": {
+    "read": {
+      "permissions": [
+        "sagemaker:DescribeCluster",
+        "sagemaker:ListTags"
+      ]
+    },
+    "create": {
+      "permissions": [
+        "sagemaker:CreateCluster",
+        "sagemaker:DescribeCluster",
+        "sagemaker:AddTags",
+        "sagemaker:ListTags",
+        "eks:DescribeAccessEntry",
+        "eks:DescribeCluster",
+        "eks:CreateAccessEntry",
+        "eks:DeleteAccessEntry",
+        "eks:AssociateAccessPolicy",
+        "iam:CreateServiceLinkedRole",
+        "iam:PassRole"
+      ],
+      "timeoutInMinutes": 720
+    },
+    "update": {
+      "permissions": [
+        "sagemaker:UpdateCluster",
+        "sagemaker:DescribeCluster",
+        "sagemaker:ListTags",
+        "sagemaker:AddTags",
+        "sagemaker:DeleteTags",
+        "eks:DescribeAccessEntry",
+        "eks:DescribeCluster",
+        "eks:CreateAccessEntry",
+        "eks:DeleteAccessEntry",
+        "iam:PassRole"
+      ],
+      "timeoutInMinutes": 720
+    },
+    "list": {
+      "permissions": [
+        "sagemaker:ListClusters"
+      ]
+    },
+    "delete": {
+      "permissions": [
+        "sagemaker:DeleteCluster",
+        "sagemaker:DescribeCluster",
+        "eks:DescribeAccessEntry",
+        "eks:DeleteAccessEntry"
+      ],
+      "timeoutInMinutes": 720
+    }
+  },
   "typeName": "AWS::SageMaker::Cluster",
+  "readOnlyProperties": [
+    "/properties/ClusterArn",
+    "/properties/CreationTime",
+    "/properties/ClusterStatus",
+    "/properties/FailureMessage",
+    "/properties/InstanceGroups/*/CurrentCount"
+  ],
   "description": "Resource Type definition for AWS::SageMaker::Cluster",
+  "additionalIdentifiers": [
+    [
+      "/properties/ClusterName"
+    ]
+  ],
+  "createOnlyProperties": [
+    "/properties/ClusterName",
+    "/properties/VpcConfig",
+    "/properties/Orchestrator",
+    "/properties/InstanceGroups/*/OverrideVpcConfig",
+    "/properties/InstanceGroups/*/ExecutionRole",
+    "/properties/InstanceGroups/*/InstanceGroupName",
+    "/properties/InstanceGroups/*/InstanceType",
+    "/properties/InstanceGroups/*/ThreadsPerCore"
+  ],
   "additionalProperties": false,
-  "properties": {
-    "ClusterName": {
-      "type": "string",
-      "description": "The name of the HyperPod Cluster.",
-      "minLength": 1,
-      "maxLength": 63,
-      "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$"
-    },
-    "ClusterArn": {
-      "type": "string",
-      "description": "The Amazon Resource Name (ARN) of the HyperPod Cluster.",
-      "maxLength": 256,
-      "pattern": "^arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:cluster/[a-z0-9]{12}$"
+  "primaryIdentifier": [
+    "/properties/ClusterArn"
+  ],
+  "definitions": {
+    "ClusterOrchestratorEksConfig": {
+      "description": "Specifies parameter(s) related to EKS as orchestrator, e.g. the EKS cluster nodes will attach to,",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+        "ClusterArn": {
+          "description": "The ARN of the EKS cluster, such as arn:aws:eks:us-west-2:123456789012:cluster/my-eks-cluster",
+          "type": "string"
+        }
+      },
+      "required": [
+        "ClusterArn"
+      ]
     },
-    "ClusterStatus": {
+    "DeepHealthCheckType": {
+      "description": "The type of deep health check(s) to be performed on the instances in the SageMaker HyperPod cluster instance group.",
       "type": "string",
-      "description": "The status of the HyperPod Cluster.",
       "enum": [
-        "Creating",
-        "Deleting",
-        "Failed",
-        "InService",
-        "RollingBack",
-        "SystemUpdating",
-        "Updating"
+        "InstanceStress",
+        "InstanceConnectivity"
       ]
     },
-    "CreationTime": {
-      "description": "The time at which the HyperPod cluster was created.",
-      "type": "string"
-    },
-    "FailureMessage": {
-      "type": "string",
-      "description": "The failure message of the HyperPod Cluster."
-    },
-    "InstanceGroups": {
-      "$ref": "#/definitions/ClusterInstanceGroupsList"
+    "ClusterInstanceStorageConfig": {
+      "oneOf": [
+        {
+          "additionalProperties": false,
+          "type": "object",
+          "properties": {
+            "EbsVolumeConfig": {
+              "$ref": "#/definitions/ClusterEbsVolumeConfig"
+            }
+          }
+        }
+      ],
+      "description": "Defines the configuration for attaching additional storage to the instances in the SageMaker HyperPod cluster instance group.",
+      "type": "object"
     },
     "VpcConfig": {
-      "$ref": "#/definitions/VpcConfig"
-    },
-    "Orchestrator": {
-      "$ref": "#/definitions/Orchestrator"
+      "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+        "Subnets": {
+          "minItems": 1,
+          "maxItems": 16,
+          "description": "The ID of the subnets in the VPC to which you want to connect your training job or model.",
+          "insertionOrder": false,
+          "type": "array",
+          "items": {
+            "pattern": "[-0-9a-zA-Z]+",
+            "type": "string",
+            "maxLength": 32
+          }
+        },
+        "SecurityGroupIds": {
+          "minItems": 1,
+          "maxItems": 5,
+          "description": "The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field.",
+          "insertionOrder": false,
+          "type": "array",
+          "items": {
+            "pattern": "[-0-9a-zA-Z]+",
+            "type": "string",
+            "maxLength": 32
+          }
+        }
+      },
+      "required": [
+        "SecurityGroupIds",
+        "Subnets"
+      ]
     },
-    "NodeRecovery": {
-      "description": "If node auto-recovery is set to true, faulty nodes will be replaced or rebooted when a failure is detected. If set to false, nodes will be labelled when a fault is detected.",
+    "InstanceGroupName": {
+      "minLength": 1,
+      "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9])*$",
+      "description": "The name of the instance group of a SageMaker HyperPod cluster.",
       "type": "string",
-      "enum": [
-        "Automatic",
-        "None"
-      ]
+      "maxLength": 63
     },
-    "Tags": {
-      "description": "Custom tags for managing the SageMaker HyperPod cluster as an AWS resource. You can add tags to your cluster in the same way you add them in other AWS services that support tagging.",
-      "type": "array",
-      "uniqueItems": true,
-      "insertionOrder": false,
-      "items": {
-        "$ref": "#/definitions/Tag"
-      },
-      "maxItems": 50
-    }
-  },
-  "definitions": {
     "ClusterInstanceGroupsList": {
-      "description": "The instance groups of the SageMaker HyperPod cluster.",
       "minItems": 1,
+      "description": "The instance groups of the SageMaker HyperPod cluster.",
       "insertionOrder": false,
       "type": "array",
       "items": {
         "$ref": "#/definitions/ClusterInstanceGroup"
       }
     },
-    "ExecutionRole": {
-      "type": "string",
-      "description": "The execution role for the instance group to assume.",
-      "minLength": 20,
-      "maxLength": 2048,
-      "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$"
-    },
-    "InstanceGroupName": {
-      "type": "string",
-      "description": "The name of the instance group of a SageMaker HyperPod cluster.",
-      "minLength": 1,
-      "maxLength": 63,
-      "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9])*$"
+    "Orchestrator": {
+      "description": "Specifies parameter(s) specific to the orchestrator, e.g. specify the EKS cluster.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+        "Eks": {
+          "$ref": "#/definitions/ClusterOrchestratorEksConfig"
+        }
+      },
+      "required": [
+        "Eks"
+      ]
     },
     "ClusterEbsVolumeConfig": {
       "description": "Defines the configuration for attaching additional Amazon Elastic Block Store (EBS) volumes to the instances in the SageMaker HyperPod cluster instance group. The additional EBS volume is attached to each instance within the SageMaker HyperPod cluster instance group and mounted to /opt/sagemaker.",
-      "type": "object",
       "additionalProperties": false,
+      "type": "object",
       "properties": {
         "VolumeSizeInGB": {
-          "type": "integer",
           "description": "The size in gigabytes (GB) of the additional EBS volume to be attached to the instances in the SageMaker HyperPod cluster instance group. The additional EBS volume is attached to each instance within the SageMaker HyperPod cluster instance group and mounted to /opt/sagemaker.",
-          "minimum": 1,
-          "maximum": 16384
+          "maximum": 16384,
+          "type": "integer",
+          "minimum": 1
         }
       }
     },
-    "ClusterInstanceStorageConfigs": {
-      "description": "The instance storage configuration for the instance group.",
-      "type": "array",
-      "insertionOrder": false,
-      "items": {
-        "$ref": "#/definitions/ClusterInstanceStorageConfig"
-      },
-      "maxItems": 1
-    },
-    "ClusterInstanceStorageConfig": {
-      "description": "Defines the configuration for attaching additional storage to the instances in the SageMaker HyperPod cluster instance group.",
-      "type": "object",
-      "oneOf": [
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "EbsVolumeConfig": {
-              "$ref": "#/definitions/ClusterEbsVolumeConfig"
-            }
-          }
-        }
-      ]
-    },
-    "InstanceType": {
-      "type": "string",
-      "description": "The instance type of the instance group of a SageMaker HyperPod cluster."
-    },
     "ClusterLifeCycleConfig": {
       "description": "The lifecycle configuration for a SageMaker HyperPod cluster.",
-      "type": "object",
       "additionalProperties": false,
+      "type": "object",
       "properties": {
-        "OnCreate": {
-          "description": "The file name of the entrypoint script of lifecycle scripts under SourceS3Uri. This entrypoint script runs during cluster creation.",
-          "type": "string",
-          "minLength": 1,
-          "maxLength": 128,
-          "pattern": "^[\\S\\s]+$"
-        },
         "SourceS3Uri": {
+          "pattern": "^(https|s3)://([^/]+)/?(.*)$",
           "description": "An Amazon S3 bucket path where your lifecycle scripts are stored.",
           "type": "string",
-          "maxLength": 1024,
-          "pattern": "^(https|s3)://([^/]+)/?(.*)$"
+          "maxLength": 1024
+        },
+        "OnCreate": {
+          "minLength": 1,
+          "pattern": "^[\\S\\s]+$",
+          "description": "The file name of the entrypoint script of lifecycle scripts under SourceS3Uri. This entrypoint script runs during cluster creation.",
+          "type": "string",
+          "maxLength": 128
         }
-      },
-      "required": [
-        "OnCreate",
-        "SourceS3Uri"
-      ]
-    },
-    "DeepHealthCheckType": {
-      "type": "string",
-      "description": "The type of deep health check(s) to be performed on the instances in the SageMaker HyperPod cluster instance group.",
-      "enum": [
-        "InstanceStress",
-        "InstanceConnectivity"
+      },
+      "required": [
+        "OnCreate",
+        "SourceS3Uri"
       ]
     },
     "OnStartDeepHealthChecks": {
       "description": "Nodes will undergo advanced stress test to detect and replace faulty instances, based on the type of deep health check(s) passed in.",
-      "type": "array",
       "insertionOrder": false,
+      "type": "array",
       "items": {
         "$ref": "#/definitions/DeepHealthCheckType"
       }
     },
     "ClusterInstanceGroup": {
       "description": "Details of an instance group in a SageMaker HyperPod cluster.",
-      "type": "object",
       "additionalProperties": false,
+      "type": "object",
       "properties": {
-        "CurrentCount": {
+        "OverrideVpcConfig": {
+          "$ref": "#/definitions/VpcConfig"
+        },
+        "InstanceCount": {
+          "description": "The number of instances you specified to add to the instance group of a SageMaker HyperPod cluster.",
           "type": "integer",
-          "description": "The number of instances that are currently in the instance group of a SageMaker HyperPod cluster.",
           "minimum": 0
         },
-        "ExecutionRole": {
-          "$ref": "#/definitions/ExecutionRole"
+        "OnStartDeepHealthChecks": {
+          "$ref": "#/definitions/OnStartDeepHealthChecks"
         },
         "InstanceGroupName": {
           "$ref": "#/definitions/InstanceGroupName"
@@ -189,28 +261,25 @@
         "InstanceStorageConfigs": {
           "$ref": "#/definitions/ClusterInstanceStorageConfigs"
         },
-        "InstanceType": {
-          "$ref": "#/definitions/InstanceType"
+        "CurrentCount": {
+          "description": "The number of instances that are currently in the instance group of a SageMaker HyperPod cluster.",
+          "type": "integer",
+          "minimum": 0
         },
         "LifeCycleConfig": {
           "$ref": "#/definitions/ClusterLifeCycleConfig"
         },
-        "InstanceCount": {
-          "type": "integer",
-          "description": "The number of instances you specified to add to the instance group of a SageMaker HyperPod cluster.",
-          "minimum": 0
+        "InstanceType": {
+          "$ref": "#/definitions/InstanceType"
         },
         "ThreadsPerCore": {
-          "type": "integer",
           "description": "The number you specified to TreadsPerCore in CreateCluster for enabling or disabling multithreading. For instance types that support multithreading, you can specify 1 for disabling multithreading and 2 for enabling multithreading.",
-          "minimum": 1,
-          "maximum": 2
-        },
-        "OnStartDeepHealthChecks": {
-          "$ref": "#/definitions/OnStartDeepHealthChecks"
+          "maximum": 2,
+          "type": "integer",
+          "minimum": 1
         },
-        "OverrideVpcConfig": {
-          "$ref": "#/definitions/VpcConfig"
+        "ExecutionRole": {
+          "$ref": "#/definitions/ExecutionRole"
         }
       },
       "required": [
@@ -221,185 +290,116 @@
         "LifeCycleConfig"
       ]
     },
-    "VpcConfig": {
-      "type": "object",
-      "additionalProperties": false,
-      "description": "Specifies an Amazon Virtual Private Cloud (VPC) that your SageMaker jobs, hosted models, and compute resources have access to. You can control access to and from your resources by configuring a VPC.",
-      "properties": {
-        "SecurityGroupIds": {
-          "description": "The VPC security group IDs, in the form sg-xxxxxxxx. Specify the security groups for the VPC that is specified in the Subnets field.",
-          "type": "array",
-          "insertionOrder": false,
-          "minItems": 1,
-          "maxItems": 5,
-          "items": {
-            "type": "string",
-            "maxLength": 32,
-            "pattern": "[-0-9a-zA-Z]+"
-          }
-        },
-        "Subnets": {
-          "description": "The ID of the subnets in the VPC to which you want to connect your training job or model.",
-          "type": "array",
-          "insertionOrder": false,
-          "minItems": 1,
-          "maxItems": 16,
-          "items": {
-            "type": "string",
-            "maxLength": 32,
-            "pattern": "[-0-9a-zA-Z]+"
-          }
-        }
-      },
-      "required": [
-        "SecurityGroupIds",
-        "Subnets"
-      ]
-    },
-    "ClusterOrchestratorEksConfig": {
-      "description": "Specifies parameter(s) related to EKS as orchestrator, e.g. the EKS cluster nodes will attach to,",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "ClusterArn": {
-          "type": "string",
-          "description": "The ARN of the EKS cluster, such as arn:aws:eks:us-west-2:123456789012:cluster/my-eks-cluster"
-        }
-      },
-      "required": [
-        "ClusterArn"
-      ]
-    },
-    "Orchestrator": {
-      "description": "Specifies parameter(s) specific to the orchestrator, e.g. specify the EKS cluster.",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "Eks": {
-          "$ref": "#/definitions/ClusterOrchestratorEksConfig"
-        }
-      },
-      "required": [
-        "Eks"
-      ]
+    "ClusterInstanceStorageConfigs": {
+      "maxItems": 1,
+      "description": "The instance storage configuration for the instance group.",
+      "insertionOrder": false,
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/ClusterInstanceStorageConfig"
+      }
     },
     "Tag": {
       "description": "A key-value pair to associate with a resource.",
+      "additionalProperties": false,
       "type": "object",
       "properties": {
-        "Key": {
+        "Value": {
+          "minLength": 0,
+          "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
+          "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
           "type": "string",
-          "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
-          "minLength": 1,
-          "maxLength": 128,
-          "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+          "maxLength": 256
         },
-        "Value": {
+        "Key": {
+          "minLength": 1,
+          "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
+          "description": "The key name of the tag. You can specify a value that is 1 to 128 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
           "type": "string",
-          "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
-          "minLength": 0,
-          "maxLength": 256,
-          "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+          "maxLength": 128
         }
       },
       "required": [
         "Key",
         "Value"
-      ],
-      "additionalProperties": false
+      ]
+    },
+    "InstanceType": {
+      "description": "The instance type of the instance group of a SageMaker HyperPod cluster.",
+      "type": "string"
+    },
+    "ExecutionRole": {
+      "minLength": 20,
+      "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
+      "description": "The execution role for the instance group to assume.",
+      "type": "string",
+      "maxLength": 2048
     }
   },
   "required": [
     "InstanceGroups"
   ],
-  "primaryIdentifier": [
-    "/properties/ClusterArn"
-  ],
-  "additionalIdentifiers": [
-    [
-      "/properties/ClusterName"
-    ]
-  ],
-  "readOnlyProperties": [
-    "/properties/ClusterArn",
-    "/properties/CreationTime",
-    "/properties/ClusterStatus",
-    "/properties/FailureMessage",
-    "/properties/InstanceGroups/*/CurrentCount"
-  ],
-  "createOnlyProperties": [
-    "/properties/ClusterName",
-    "/properties/VpcConfig",
-    "/properties/Orchestrator",
-    "/properties/InstanceGroups/*/OverrideVpcConfig",
-    "/properties/InstanceGroups/*/ExecutionRole",
-    "/properties/InstanceGroups/*/InstanceGroupName",
-    "/properties/InstanceGroups/*/InstanceType",
-    "/properties/InstanceGroups/*/ThreadsPerCore"
-  ],
-  "tagging": {
-    "taggable": true,
-    "tagOnCreate": true,
-    "tagUpdatable": true,
-    "cloudFormationSystemTags": false,
-    "tagProperty": "/properties/Tags",
-    "permissions": [
-      "sagemaker:AddTags",
-      "sagemaker:ListTags",
-      "sagemaker:DeleteTags"
-    ]
-  },
-  "handlers": {
-    "create": {
-      "permissions": [
-        "sagemaker:CreateCluster",
-        "sagemaker:DescribeCluster",
-        "sagemaker:AddTags",
-        "sagemaker:ListTags",
-        "eks:DescribeAccessEntry",
-        "eks:DescribeCluster",
-        "eks:CreateAccessEntry",
-        "eks:DeleteAccessEntry",
-        "eks:AssociateAccessPolicy",
-        "iam:CreateServiceLinkedRole",
-        "iam:PassRole"
-      ],
-      "timeoutInMinutes": 720
+  "properties": {
+    "ClusterArn": {
+      "pattern": "^arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:cluster/[a-z0-9]{12}$",
+      "description": "The Amazon Resource Name (ARN) of the HyperPod Cluster.",
+      "type": "string",
+      "maxLength": 256
     },
-    "read": {
-      "permissions": [
-        "sagemaker:DescribeCluster",
-        "sagemaker:ListTags"
+    "VpcConfig": {
+      "$ref": "#/definitions/VpcConfig"
+    },
+    "NodeRecovery": {
+      "description": "If node auto-recovery is set to true, faulty nodes will be replaced or rebooted when a failure is detected. If set to false, nodes will be labelled when a fault is detected.",
+      "type": "string",
+      "enum": [
+        "Automatic",
+        "None"
       ]
     },
-    "update": {
-      "permissions": [
-        "sagemaker:UpdateCluster",
-        "sagemaker:DescribeCluster",
-        "sagemaker:ListTags",
-        "sagemaker:AddTags",
-        "sagemaker:DeleteTags",
-        "eks:DescribeAccessEntry",
-        "eks:DescribeCluster",
-        "eks:CreateAccessEntry",
-        "eks:DeleteAccessEntry",
-        "iam:PassRole"
-      ],
-      "timeoutInMinutes": 720
+    "CreationTime": {
+      "description": "The time at which the HyperPod cluster was created.",
+      "type": "string"
     },
-    "delete": {
-      "permissions": [
-        "sagemaker:DeleteCluster",
-        "sagemaker:DescribeCluster",
-        "eks:DescribeAccessEntry",
-        "eks:DeleteAccessEntry"
-      ],
-      "timeoutInMinutes": 720
+    "InstanceGroups": {
+      "$ref": "#/definitions/ClusterInstanceGroupsList"
     },
-    "list": {
-      "permissions": [
-        "sagemaker:ListClusters"
+    "ClusterName": {
+      "minLength": 1,
+      "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$",
+      "description": "The name of the HyperPod Cluster.",
+      "type": "string",
+      "maxLength": 63
+    },
+    "FailureMessage": {
+      "description": "The failure message of the HyperPod Cluster.",
+      "type": "string"
+    },
+    "Orchestrator": {
+      "$ref": "#/definitions/Orchestrator"
+    },
+    "ClusterStatus": {
+      "description": "The status of the HyperPod Cluster.",
+      "type": "string",
+      "enum": [
+        "Creating",
+        "Deleting",
+        "Failed",
+        "InService",
+        "RollingBack",
+        "SystemUpdating",
+        "Updating"
       ]
+    },
+    "Tags": {
+      "maxItems": 50,
+      "uniqueItems": true,
+      "description": "Custom tags for managing the SageMaker HyperPod cluster as an AWS resource. You can add tags to your cluster in the same way you add them in other AWS services that support tagging.",
+      "insertionOrder": false,
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Tag"
+      }
     }
   }
 }
diff --git a/internal/aws/cfn/schemas/aws/sagemaker/domain.json b/internal/aws/cfn/schemas/aws/sagemaker/domain.json
index e1b179eb..217b79d5 100644
--- a/internal/aws/cfn/schemas/aws/sagemaker/domain.json
+++ b/internal/aws/cfn/schemas/aws/sagemaker/domain.json
@@ -629,6 +629,9 @@
       "properties": {
         "EFSFileSystemConfig": {
           "$ref": "#/definitions/EFSFileSystemConfig"
+        },
+        "FSxLustreFileSystemConfig": {
+          "$ref": "#/definitions/FSxLustreFileSystemConfig"
         }
       }
     },
@@ -653,6 +656,27 @@
         "FileSystemId"
       ]
     },
+    "FSxLustreFileSystemConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "FileSystemPath": {
+          "type": "string",
+          "pattern": "^\\/\\S*$",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "FileSystemId": {
+          "type": "string",
+          "minLength": 11,
+          "maxLength": 21,
+          "pattern": "^(fs-[0-9a-f]{8,})$"
+        }
+      },
+      "required": [
+        "FileSystemId"
+      ]
+    },
     "CustomImage": {
       "type": "object",
       "description": "A custom SageMaker image.",
diff --git a/internal/aws/cfn/schemas/aws/sagemaker/endpointconfig.json b/internal/aws/cfn/schemas/aws/sagemaker/endpointconfig.json
index 5c5c4dda..d5c4fadc 100644
--- a/internal/aws/cfn/schemas/aws/sagemaker/endpointconfig.json
+++ b/internal/aws/cfn/schemas/aws/sagemaker/endpointconfig.json
@@ -116,9 +116,6 @@
         "RoutingConfig": {
           "$ref": "#/definitions/RoutingConfig"
         },
-        "AcceleratorType": {
-          "type": "string"
-        },
         "InitialVariantWeight": {
           "type": "number"
         },
diff --git a/internal/aws/cfn/schemas/aws/sagemaker/partnerapp.json b/internal/aws/cfn/schemas/aws/sagemaker/partnerapp.json
new file mode 100644
index 00000000..626573d9
--- /dev/null
+++ b/internal/aws/cfn/schemas/aws/sagemaker/partnerapp.json
@@ -0,0 +1,244 @@
+{
+  "typeName": "AWS::SageMaker::PartnerApp",
+  "description": "Resource Type definition for AWS::SageMaker::PartnerApp",
+  "additionalProperties": false,
+  "properties": {
+    "Arn": {
+      "type": "string",
+      "description": "The Amazon Resource Name (ARN) of the created PartnerApp.",
+      "minLength": 1,
+      "maxLength": 128,
+      "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:partner-app/app-[A-Z0-9]{12}$"
+    },
+    "Name": {
+      "type": "string",
+      "description": "A name for the PartnerApp.",
+      "minLength": 1,
+      "maxLength": 256,
+      "pattern": "^[a-zA-Z0-9]+"
+    },
+    "Type": {
+      "type": "string",
+      "description": "The type of PartnerApp.",
+      "enum": [
+        "lakera-guard",
+        "comet",
+        "deepchecks-llm-evaluation",
+        "fiddler"
+      ]
+    },
+    "ExecutionRoleArn": {
+      "type": "string",
+      "description": "The execution role for the user.",
+      "minLength": 20,
+      "maxLength": 2048,
+      "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$"
+    },
+    "Tier": {
+      "type": "string",
+      "description": "The tier of the PartnerApp.",
+      "minLength": 1,
+      "maxLength": 64
+    },
+    "EnableIamSessionBasedIdentity": {
+      "type": "boolean",
+      "description": "Enables IAM Session based Identity for PartnerApp."
+    },
+    "ApplicationConfig": {
+      "$ref": "#/definitions/PartnerAppConfig",
+      "description": "A collection of settings that specify the maintenance schedule for the PartnerApp."
+    },
+    "AuthType": {
+      "type": "string",
+      "description": "The Auth type of PartnerApp.",
+      "enum": [
+        "IAM"
+      ]
+    },
+    "BaseUrl": {
+      "type": "string",
+      "description": "The AppServerUrl based on app and account-info.",
+      "maxLength": 2048
+    },
+    "MaintenanceConfig": {
+      "$ref": "#/definitions/PartnerAppMaintenanceConfig",
+      "description": "A collection of settings that specify the maintenance schedule for the PartnerApp."
+    },
+    "ClientToken": {
+      "type": "string",
+      "description": "The client token for the PartnerApp.",
+      "minLength": 1,
+      "maxLength": 36,
+      "pattern": "^[a-zA-Z0-9-]+$"
+    },
+    "Tags": {
+      "type": "array",
+      "description": "A list of tags to apply to the PartnerApp.",
+      "uniqueItems": false,
+      "insertionOrder": false,
+      "minItems": 0,
+      "maxItems": 50,
+      "items": {
+        "$ref": "#/definitions/Tag"
+      }
+    }
+  },
+  "definitions": {
+    "PartnerAppConfig": {
+      "type": "object",
+      "description": "A collection of configuration settings for the PartnerApp.",
+      "additionalProperties": false,
+      "properties": {
+        "AdminUsers": {
+          "type": "array",
+          "description": "A list of users with administrator privileges for the PartnerApp.",
+          "uniqueItems": true,
+          "insertionOrder": false,
+          "minItems": 0,
+          "maxItems": 5,
+          "items": {
+            "$ref": "#/definitions/PartnerAppAdminUserList"
+          }
+        },
+        "Arguments": {
+          "description": "A list of arguments to pass to the PartnerApp.",
+          "type": "object",
+          "additionalProperties": false,
+          "maxProperties": 5,
+          "patternProperties": {
+            "^(?!\\s*$).{1,256}$": {
+              "type": "string",
+              "pattern": "^.{0,1024}$",
+              "maxLength": 1024
+            }
+          }
+        }
+      }
+    },
+    "PartnerAppAdminUserList": {
+      "type": "string",
+      "description": "A collection of AdminUsers for the PartnerApp",
+      "additionalProperties": false,
+      "minLength": 1,
+      "maxLength": 256
+    },
+    "PartnerAppMaintenanceConfig": {
+      "type": "object",
+      "description": "A collection of settings that specify the maintenance schedule for the PartnerApp.",
+      "additionalProperties": false,
+      "properties": {
+        "MaintenanceWindowStart": {
+          "type": "string",
+          "description": "The maintenance window start day and time for the PartnerApp.",
+          "maxLength": 9,
+          "pattern": "(Mon|Tue|Wed|Thu|Fri|Sat|Sun):([01]\\d|2[0-3]):([0-5]\\d)"
+        }
+      },
+      "required": [
+        "MaintenanceWindowStart"
+      ]
+    },
+    "Tag": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "Value": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 128
+        },
+        "Key": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 128
+        }
+      },
+      "required": [
+        "Key",
+        "Value"
+      ]
+    }
+  },
+  "required": [
+    "Name",
+    "Type",
+    "AuthType",
+    "ExecutionRoleArn",
+    "Tier"
+  ],
+  "createOnlyProperties": [
+    "/properties/Name",
+    "/properties/Type",
+    "/properties/ExecutionRoleArn",
+    "/properties/AuthType"
+  ],
+  "readOnlyProperties": [
+    "/properties/Arn",
+    "/properties/BaseUrl"
+  ],
+  "writeOnlyProperties": [
+    "/properties/ClientToken"
+  ],
+  "deprecatedProperties": [
+    "/properties/ClientToken"
+  ],
+  "primaryIdentifier": [
+    "/properties/Arn"
+  ],
+  "replacementStrategy": "delete_then_create",
+  "handlers": {
+    "create": {
+      "permissions": [
+        "sagemaker:CreatePartnerApp",
+        "sagemaker:DescribePartnerApp",
+        "sagemaker:AddTags",
+        "sagemaker:ListTags",
+        "iam:PassRole"
+      ],
+      "timeoutInMinutes": 180
+    },
+    "read": {
+      "permissions": [
+        "sagemaker:DescribePartnerApp",
+        "sagemaker:ListTags"
+      ]
+    },
+    "update": {
+      "permissions": [
+        "sagemaker:UpdatePartnerApp",
+        "sagemaker:DescribePartnerApp",
+        "sagemaker:AddTags",
+        "sagemaker:ListTags",
+        "sagemaker:DeleteTags"
+      ],
+      "timeoutInMinutes": 180
+    },
+    "delete": {
+      "permissions": [
+        "sagemaker:DeletePartnerApp",
+        "sagemaker:DescribePartnerApp",
+        "sagemaker:DeleteTags"
+      ],
+      "timeoutInMinutes": 240
+    },
+    "list": {
+      "permissions": [
+        "sagemaker:ListPartnerApps",
+        "sagemaker:DescribePartnerApp",
+        "sagemaker:ListTags"
+      ]
+    }
+  },
+  "tagging": {
+    "taggable": true,
+    "tagOnCreate": true,
+    "tagUpdatable": true,
+    "cloudFormationSystemTags": false,
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "sagemaker:AddTags",
+      "sagemaker:DeleteTags",
+      "sagemaker:ListTags"
+    ]
+  }
+}
diff --git a/internal/aws/cfn/schemas/aws/sagemaker/space.json b/internal/aws/cfn/schemas/aws/sagemaker/space.json
index 4cc10499..fd4e2d2e 100644
--- a/internal/aws/cfn/schemas/aws/sagemaker/space.json
+++ b/internal/aws/cfn/schemas/aws/sagemaker/space.json
@@ -145,6 +145,9 @@
       "properties": {
         "EFSFileSystem": {
           "$ref": "#/definitions/EFSFileSystem"
+        },
+        "FSxLustreFileSystem": {
+          "$ref": "#/definitions/FSxLustreFileSystem"
         }
       }
     },
@@ -163,6 +166,21 @@
         "FileSystemId"
       ]
     },
+    "FSxLustreFileSystem": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "FileSystemId": {
+          "type": "string",
+          "minLength": 11,
+          "maxLength": 21,
+          "pattern": "^(fs-[0-9a-f]{8,})$"
+        }
+      },
+      "required": [
+        "FileSystemId"
+      ]
+    },
     "SpaceJupyterLabAppSettings": {
       "type": "object",
       "description": "The JupyterServer app settings.",
diff --git a/internal/aws/cfn/schemas/aws/sagemaker/userprofile.json b/internal/aws/cfn/schemas/aws/sagemaker/userprofile.json
index 1444514e..a6343c75 100644
--- a/internal/aws/cfn/schemas/aws/sagemaker/userprofile.json
+++ b/internal/aws/cfn/schemas/aws/sagemaker/userprofile.json
@@ -485,6 +485,9 @@
       "properties": {
         "EFSFileSystemConfig": {
           "$ref": "#/definitions/EFSFileSystemConfig"
+        },
+        "FSxLustreFileSystemConfig": {
+          "$ref": "#/definitions/FSxLustreFileSystemConfig"
         }
       }
     },
@@ -509,6 +512,27 @@
         "FileSystemId"
       ]
     },
+    "FSxLustreFileSystemConfig": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "FileSystemPath": {
+          "type": "string",
+          "pattern": "^\\/\\S*$",
+          "minLength": 1,
+          "maxLength": 256
+        },
+        "FileSystemId": {
+          "type": "string",
+          "minLength": 11,
+          "maxLength": 21,
+          "pattern": "^(fs-[0-9a-f]{8,})$"
+        }
+      },
+      "required": [
+        "FileSystemId"
+      ]
+    },
     "CustomImage": {
       "type": "object",
       "description": "A custom SageMaker image.",
diff --git a/internal/aws/cfn/schemas/aws/securityhub/configurationpolicy.json b/internal/aws/cfn/schemas/aws/securityhub/configurationpolicy.json
index 13f8530d..b8606c13 100644
--- a/internal/aws/cfn/schemas/aws/securityhub/configurationpolicy.json
+++ b/internal/aws/cfn/schemas/aws/securityhub/configurationpolicy.json
@@ -8,7 +8,7 @@
       "type": "object",
       "additionalProperties": false,
       "patternProperties": {
-        "^[a-zA-Z0-9]{1,128}$": {
+        "^(?!aws:)[a-zA-Z+-=._:/]{1,128}$": {
           "type": "string",
           "description": "The value for the tag. You can specify a value that is 0 to 256 Unicode characters in length and cannot be prefixed with aws:. You can use any of the following characters: the set of Unicode letters, digits, whitespace, _, ., /, =, +, and -.",
           "minLength": 0,
diff --git a/internal/aws/cfn/schemas/aws/ses/configurationset.json b/internal/aws/cfn/schemas/aws/ses/configurationset.json
index 6c6ffb6a..1171537e 100644
--- a/internal/aws/cfn/schemas/aws/ses/configurationset.json
+++ b/internal/aws/cfn/schemas/aws/ses/configurationset.json
@@ -11,6 +11,11 @@
         "CustomRedirectDomain": {
           "type": "string",
           "description": "The domain to use for tracking open and click events."
+        },
+        "HttpsPolicy": {
+          "type": "string",
+          "description": "The https policy to use for tracking open and click events.",
+          "pattern": "REQUIRE|REQUIRE_OPEN_ONLY|OPTIONAL"
         }
       }
     },
diff --git a/internal/aws/cfn/schemas/aws/ses/mailmanagerruleset.json b/internal/aws/cfn/schemas/aws/ses/mailmanagerruleset.json
index fb509f13..82c64c37 100644
--- a/internal/aws/cfn/schemas/aws/ses/mailmanagerruleset.json
+++ b/internal/aws/cfn/schemas/aws/ses/mailmanagerruleset.json
@@ -94,6 +94,38 @@
       ],
       "additionalProperties": false
     },
+    "DeliverToQBusinessAction": {
+      "type": "object",
+      "properties": {
+        "ActionFailurePolicy": {
+          "$ref": "#/definitions/ActionFailurePolicy"
+        },
+        "ApplicationId": {
+          "type": "string",
+          "maxLength": 36,
+          "minLength": 36,
+          "pattern": "^[a-z0-9-]+$"
+        },
+        "IndexId": {
+          "type": "string",
+          "maxLength": 36,
+          "minLength": 36,
+          "pattern": "^[a-z0-9-]+$"
+        },
+        "RoleArn": {
+          "type": "string",
+          "maxLength": 2048,
+          "minLength": 20,
+          "pattern": "^[a-zA-Z0-9:_/+=,@.#-]+$"
+        }
+      },
+      "required": [
+        "ApplicationId",
+        "IndexId",
+        "RoleArn"
+      ],
+      "additionalProperties": false
+    },
     "DropAction": {
       "type": "object",
       "additionalProperties": false
@@ -288,6 +320,19 @@
             "DeliverToMailbox"
           ],
           "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "title": "DeliverToQBusiness",
+          "properties": {
+            "DeliverToQBusiness": {
+              "$ref": "#/definitions/DeliverToQBusinessAction"
+            }
+          },
+          "required": [
+            "DeliverToQBusiness"
+          ],
+          "additionalProperties": false
         }
       ]
     },
diff --git a/internal/aws/cfn/schemas/aws/ssmquicksetup/configurationmanager.json b/internal/aws/cfn/schemas/aws/ssmquicksetup/configurationmanager.json
index f559171a..9ff7405e 100644
--- a/internal/aws/cfn/schemas/aws/ssmquicksetup/configurationmanager.json
+++ b/internal/aws/cfn/schemas/aws/ssmquicksetup/configurationmanager.json
@@ -115,11 +115,11 @@
     "TagsMap": {
       "type": "object",
       "patternProperties": {
-        "^[A-Za-z0-9+=@_\\/:.-]+$": {
+        "^[A-Za-z0-9 +=@_\\/:.-]+$": {
           "type": "string",
           "maxLength": 256,
           "minLength": 1,
-          "pattern": "^[A-Za-z0-9+=@_\\/:.-]+$"
+          "pattern": "^[A-Za-z0-9 +=@_\\/:.-]+$"
         }
       },
       "additionalProperties": false
diff --git a/internal/aws/cfn/schemas/aws/synthetics/canary.json b/internal/aws/cfn/schemas/aws/synthetics/canary.json
index 7a9c0f13..f23e79c3 100644
--- a/internal/aws/cfn/schemas/aws/synthetics/canary.json
+++ b/internal/aws/cfn/schemas/aws/synthetics/canary.json
@@ -190,6 +190,10 @@
           "items": {
             "type": "string"
           }
+        },
+        "Ipv6AllowedForDualStack": {
+          "description": "Allow outbound IPv6 traffic on VPC canaries that are connected to dual-stack subnets if set to true",
+          "type": "boolean"
         }
       },
       "required": [
@@ -361,7 +365,10 @@
         "lambda:ListTags",
         "lambda:TagResource",
         "lambda:UntagResource",
-        "iam:PassRole"
+        "iam:PassRole",
+        "ec2:DescribeVpcs",
+        "ec2:DescribeSubnets",
+        "ec2:DescribeSecurityGroups"
       ]
     },
     "read": {
diff --git a/internal/aws/cfn/schemas/aws/voiceid/domain.json b/internal/aws/cfn/schemas/aws/voiceid/domain.json
index 053e4513..f96715aa 100644
--- a/internal/aws/cfn/schemas/aws/voiceid/domain.json
+++ b/internal/aws/cfn/schemas/aws/voiceid/domain.json
@@ -78,11 +78,6 @@
   "readOnlyProperties": [
     "/properties/DomainId"
   ],
-  "writeOnlyProperties": [
-    "/properties/Description",
-    "/properties/Name",
-    "/properties/ServerSideEncryptionConfiguration"
-  ],
   "primaryIdentifier": [
     "/properties/DomainId"
   ],
@@ -91,7 +86,11 @@
     "tagOnCreate": true,
     "tagUpdatable": true,
     "cloudFormationSystemTags": true,
-    "tagProperty": "#/properties/Tags"
+    "tagProperty": "/properties/Tags",
+    "permissions": [
+      "voiceid:TagResource",
+      "voiceid:UntagResource"
+    ]
   },
   "handlers": {
     "create": {
diff --git a/internal/aws/cfn/schemas/aws/vpclattice/resourceconfiguration.json b/internal/aws/cfn/schemas/aws/vpclattice/resourceconfiguration.json
index cd5a21f1..7c2826a3 100644
--- a/internal/aws/cfn/schemas/aws/vpclattice/resourceconfiguration.json
+++ b/internal/aws/cfn/schemas/aws/vpclattice/resourceconfiguration.json
@@ -35,7 +35,7 @@
     "ArnResource": {
       "type": "string",
       "maxLength": 1224,
-      "pattern": "^arn:[a-z0-9][-.a-z0-9]{0,62}:vpc-lattice:([a-z0-9][-.a-z0-9]{0,62})?:\\d{12}?:[^/].{0,1023}$"
+      "pattern": "^arn.*"
     },
     "PortRange": {
       "type": "string",
diff --git a/internal/aws/cfn/schemas/aws/wisdom/aiagent.json b/internal/aws/cfn/schemas/aws/wisdom/aiagent.json
index 98f6b56d..e68dba03 100644
--- a/internal/aws/cfn/schemas/aws/wisdom/aiagent.json
+++ b/internal/aws/cfn/schemas/aws/wisdom/aiagent.json
@@ -340,6 +340,9 @@
     },
     "Type": {
       "$ref": "#/definitions/AIAgentType"
+    },
+    "ModifiedTimeSeconds": {
+      "type": "number"
     }
   },
   "required": [
@@ -350,7 +353,8 @@
   "readOnlyProperties": [
     "/properties/AIAgentArn",
     "/properties/AIAgentId",
-    "/properties/AssistantArn"
+    "/properties/AssistantArn",
+    "/properties/ModifiedTimeSeconds"
   ],
   "createOnlyProperties": [
     "/properties/AssistantId",
diff --git a/internal/aws/cfn/schemas/aws/wisdom/aiprompt.json b/internal/aws/cfn/schemas/aws/wisdom/aiprompt.json
index 22a826b9..8c54c898 100644
--- a/internal/aws/cfn/schemas/aws/wisdom/aiprompt.json
+++ b/internal/aws/cfn/schemas/aws/wisdom/aiprompt.json
@@ -118,6 +118,9 @@
     },
     "Type": {
       "$ref": "#/definitions/AIPromptType"
+    },
+    "ModifiedTimeSeconds": {
+      "type": "number"
     }
   },
   "required": [
@@ -130,7 +133,8 @@
   "readOnlyProperties": [
     "/properties/AIPromptArn",
     "/properties/AIPromptId",
-    "/properties/AssistantArn"
+    "/properties/AssistantArn",
+    "/properties/ModifiedTimeSeconds"
   ],
   "createOnlyProperties": [
     "/properties/ApiFormat",
diff --git a/internal/cmd/build/build.go b/internal/cmd/build/build.go
index b80354dc..23a82fee 100644
--- a/internal/cmd/build/build.go
+++ b/internal/cmd/build/build.go
@@ -194,7 +194,10 @@ func buildProp(n *yaml.Node, propName string, prop cfn.Prop, schema cfn.Schema,
 		} else {
 			config.Debugf("Missing Ref: %s, ancestors: %v, %+v",
 				propName, ancestorTypes, prop)
-			return fmt.Errorf("expected blank type to have $ref: %s", propName)
+			// Sometimes there are properties that are defined as "{}",
+			// possibly as a placeholder for future definitions?
+			config.Debugf("expected blank type to have $ref: %s", propName)
+			return nil // Ignore this property... will this break for defs referenced by props?
 		}
 	default:
 		return fmt.Errorf("unexpected prop type for %s: %s", propName, prop.Type)
diff --git a/internal/config/version.go b/internal/config/version.go
index a88796d9..21d17250 100644
--- a/internal/config/version.go
+++ b/internal/config/version.go
@@ -5,5 +5,5 @@ const (
 	NAME = "Rain"
 
 	// VERSION is the application's version string
-	VERSION = "v1.20.2"
+	VERSION = "v1.21.0"
 )
diff --git a/test/templates/build/bucket/bucket.yaml b/test/templates/build/bucket/bucket.yaml
index 17b61496..a2047ba3 100644
--- a/test/templates/build/bucket/bucket.yaml
+++ b/test/templates/build/bucket/bucket.yaml
@@ -6,6 +6,10 @@ Description: |
   environment. **WARNING** This template will create resources in your account
   that may incur billing charges.
 
+Metadata:
+  AWSToolsMetrics:
+    Rain: '{"Version":"v1.21.0","Experimental":true,"HasModules":true,"HasRainSection":false}'
+
 Parameters:
   AppName:
     Description: This name is used as a prefix for resource names
diff --git a/test/templates/build/bucket/website.yaml b/test/templates/build/bucket/website.yaml
index e7cf4adc..029cecfb 100644
--- a/test/templates/build/bucket/website.yaml
+++ b/test/templates/build/bucket/website.yaml
@@ -6,6 +6,10 @@ Description: |
   template will create resources in your account that may incur billing
   charges.
 
+Metadata:
+  AWSToolsMetrics:
+    Rain: '{"Version":"v1.21.0","Experimental":true,"HasModules":true,"HasRainSection":false}'
+
 Parameters:
   AppName:
     Description: This name be used as a prefix for resource names
diff --git a/test/templates/build/ecs/cluster.yaml b/test/templates/build/ecs/cluster.yaml
index ad169cda..ed97c593 100644
--- a/test/templates/build/ecs/cluster.yaml
+++ b/test/templates/build/ecs/cluster.yaml
@@ -1,6 +1,10 @@
 Description: |
   Create a VPC, load balancer, and ECS cluster
 
+Metadata:
+  AWSToolsMetrics:
+    Rain: '{"Version":"v1.21.0","Experimental":true,"HasModules":true,"HasRainSection":false}'
+
 Parameters:
   ImageURL:
     Description: The URL to the container image
diff --git a/test/templates/build/eventbridge/central-logs.yaml b/test/templates/build/eventbridge/central-logs.yaml
index a4cb49bc..04f6dbf5 100644
--- a/test/templates/build/eventbridge/central-logs.yaml
+++ b/test/templates/build/eventbridge/central-logs.yaml
@@ -2,6 +2,10 @@ AWSTemplateFormatVersion: "2010-09-09"
 
 Description: "A central event bus rule and log group to collect CloudFormation logs \nfrom all target accounts. This example can be adapted to collect logs\nfrom other services besides CloudFormation, by editing the embedded template \nthat is used to create stack instances in target accounts.\n"
 
+Metadata:
+  AWSToolsMetrics:
+    Rain: '{"Version":"v1.21.0","Experimental":true,"HasModules":false,"HasRainSection":false}'
+
 Parameters:
   OUID:
     Description: "The Id of the Organization Unit to deploy the stack set to. \nAll accounts under this OU will receive stack instances of the \nchild template embedded in this template.\n"
diff --git a/test/templates/build/pipeline/codecommit.yaml b/test/templates/build/pipeline/codecommit.yaml
index 604b8a9a..e89eb22c 100644
--- a/test/templates/build/pipeline/codecommit.yaml
+++ b/test/templates/build/pipeline/codecommit.yaml
@@ -6,6 +6,10 @@ Description: |
   template will create resources in your account that may incur billing
   charges.
 
+Metadata:
+  AWSToolsMetrics:
+    Rain: '{"Version":"v1.21.0","Experimental":true,"HasModules":false,"HasRainSection":false}'
+
 Parameters:
   ArtifactBucket:
     Description: The name of the bucket to use for storing pipeline artifacts
diff --git a/test/templates/build/pipeline/s3.yaml b/test/templates/build/pipeline/s3.yaml
index b815d918..5419811f 100644
--- a/test/templates/build/pipeline/s3.yaml
+++ b/test/templates/build/pipeline/s3.yaml
@@ -5,6 +5,10 @@ Description: |
   template will create resources in your account that may incur billing
   charges.
 
+Metadata:
+  AWSToolsMetrics:
+    Rain: '{"Version":"v1.21.0","Experimental":true,"HasModules":false,"HasRainSection":false}'
+
 Parameters:
   SourceBucket:
     Description: The name of the bucket to use for source code
diff --git a/test/templates/build/vpc/vpc.yaml b/test/templates/build/vpc/vpc.yaml
index 793b7e87..8292c09f 100644
--- a/test/templates/build/vpc/vpc.yaml
+++ b/test/templates/build/vpc/vpc.yaml
@@ -1,5 +1,9 @@
 Description: "This template creates a VPC with two public and two private subnets. \nFlow logs are saved to CloudWatch.\n"
 
+Metadata:
+  AWSToolsMetrics:
+    Rain: '{"Version":"v1.21.0","Experimental":true,"HasModules":true,"HasRainSection":false}'
+
 Resources:
   FlowLogsRole:
     Type: AWS::IAM::Role
diff --git a/test/templates/build/webapp/webapp.yaml b/test/templates/build/webapp/webapp.yaml
index 3736d871..91aef332 100644
--- a/test/templates/build/webapp/webapp.yaml
+++ b/test/templates/build/webapp/webapp.yaml
@@ -1,5 +1,9 @@
 Description: Creates a web application with a static website using S3 and CloudFront, an API Gateway REST API, and a DynamoDB table, with Cognito authentication. Apache-2.0 License. Adapt this template to your needs and thoruoughly test it before introducing it in a production environment. **WARNING** This template will create resources in your account that may incur billing charges.
 
+Metadata:
+  AWSToolsMetrics:
+    Rain: '{"Version":"v1.21.0","Experimental":true,"HasModules":false,"HasRainSection":false}'
+
 Parameters:
   AppName:
     Description: This name is used as a prefix for resource names