diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index c9a8b8c6e..7905eeef1 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -53,14 +53,14 @@ type VpcFilterOptions struct {
 }
 
 type Statement struct {
-	Effect   string
-	Action   []string
-	Resource []string
+	Effect   string   `mapstructure:"Effect" required:"false"`
+	Action   []string `mapstructure:"Action" required:"false"`
+	Resource []string `mapstructure:"Resource" required:"false"`
 }
 
 type PolicyDocument struct {
-	Version   string
-	Statement []Statement
+	Version   string      `mapstructure:"Version" required:"false"`
+	Statement []Statement `mapstructure:"Statement" required:"false"`
 }
 
 type SecurityGroupFilterOptions struct {
diff --git a/builder/amazon/common/run_config.hcl2spec.go b/builder/amazon/common/run_config.hcl2spec.go
index 88dcf0c66..12b9a4482 100644
--- a/builder/amazon/common/run_config.hcl2spec.go
+++ b/builder/amazon/common/run_config.hcl2spec.go
@@ -39,8 +39,8 @@ func (*FlatAmiFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatPolicyDocument is an auto-generated flat version of PolicyDocument.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatPolicyDocument struct {
-	Version   *string         `cty:"version" hcl:"version"`
-	Statement []FlatStatement `cty:"statement" hcl:"statement"`
+	Version   *string         `mapstructure:"Version" required:"false" cty:"Version" hcl:"Version"`
+	Statement []FlatStatement `mapstructure:"Statement" required:"false" cty:"Statement" hcl:"Statement"`
 }
 
 // FlatMapstructure returns a new FlatPolicyDocument.
@@ -55,8 +55,8 @@ func (*PolicyDocument) FlatMapstructure() interface{ HCL2Spec() map[string]hclde
 // The decoded values from this spec will then be applied to a FlatPolicyDocument.
 func (*FlatPolicyDocument) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"version":   &hcldec.AttrSpec{Name: "version", Type: cty.String, Required: false},
-		"statement": &hcldec.BlockListSpec{TypeName: "statement", Nested: hcldec.ObjectSpec((*FlatStatement)(nil).HCL2Spec())},
+		"Version":   &hcldec.AttrSpec{Name: "Version", Type: cty.String, Required: false},
+		"Statement": &hcldec.BlockListSpec{TypeName: "Statement", Nested: hcldec.ObjectSpec((*FlatStatement)(nil).HCL2Spec())},
 	}
 	return s
 }
@@ -89,9 +89,9 @@ func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatStatement is an auto-generated flat version of Statement.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatStatement struct {
-	Effect   *string  `cty:"effect" hcl:"effect"`
-	Action   []string `cty:"action" hcl:"action"`
-	Resource []string `cty:"resource" hcl:"resource"`
+	Effect   *string  `mapstructure:"Effect" required:"false" cty:"Effect" hcl:"Effect"`
+	Action   []string `mapstructure:"Action" required:"false" cty:"Action" hcl:"Action"`
+	Resource []string `mapstructure:"Resource" required:"false" cty:"Resource" hcl:"Resource"`
 }
 
 // FlatMapstructure returns a new FlatStatement.
@@ -106,9 +106,9 @@ func (*Statement) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spe
 // The decoded values from this spec will then be applied to a FlatStatement.
 func (*FlatStatement) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"effect":   &hcldec.AttrSpec{Name: "effect", Type: cty.String, Required: false},
-		"action":   &hcldec.AttrSpec{Name: "action", Type: cty.List(cty.String), Required: false},
-		"resource": &hcldec.AttrSpec{Name: "resource", Type: cty.List(cty.String), Required: false},
+		"Effect":   &hcldec.AttrSpec{Name: "Effect", Type: cty.String, Required: false},
+		"Action":   &hcldec.AttrSpec{Name: "Action", Type: cty.List(cty.String), Required: false},
+		"Resource": &hcldec.AttrSpec{Name: "Resource", Type: cty.List(cty.String), Required: false},
 	}
 	return s
 }
diff --git a/website/pages/partials/builder/amazon/common/PolicyDocument-not-required.mdx b/website/pages/partials/builder/amazon/common/PolicyDocument-not-required.mdx
new file mode 100644
index 000000000..c54034445
--- /dev/null
+++ b/website/pages/partials/builder/amazon/common/PolicyDocument-not-required.mdx
@@ -0,0 +1,5 @@
+<!-- Code generated from the comments of the PolicyDocument struct in builder/amazon/common/run_config.go; DO NOT EDIT MANUALLY -->
+
+- `Version` (string) - Version
+
+- `Statement` ([]Statement) - Statement
diff --git a/website/pages/partials/builder/amazon/common/Statement-not-required.mdx b/website/pages/partials/builder/amazon/common/Statement-not-required.mdx
new file mode 100644
index 000000000..9e4fae587
--- /dev/null
+++ b/website/pages/partials/builder/amazon/common/Statement-not-required.mdx
@@ -0,0 +1,7 @@
+<!-- Code generated from the comments of the Statement struct in builder/amazon/common/run_config.go; DO NOT EDIT MANUALLY -->
+
+- `Effect` (string) - Effect
+
+- `Action` ([]string) - Action
+
+- `Resource` ([]string) - Resource