diff --git a/compliance/frameworks/baseline/efficiency/aws_baseline_efficiency.yaml b/compliance/frameworks/baseline/efficiency/aws_baseline_efficiency.yaml
index 3183b7dd5..5c6f7d7f6 100755
--- a/compliance/frameworks/baseline/efficiency/aws_baseline_efficiency.yaml
+++ b/compliance/frameworks/baseline/efficiency/aws_baseline_efficiency.yaml
@@ -14,5 +14,5 @@ Tags:
         - efficiency
     type:
         - BASELINE
-Title: AWS Baseline Efficiency
+Title: AWS
 TracksDriftEvents: false
diff --git a/compliance/frameworks/cloud/aws_all_controls/root.yaml b/compliance/frameworks/cloud/aws_all_controls/root.yaml
index 5efc8fcb6..5bfa532de 100755
--- a/compliance/frameworks/cloud/aws_all_controls/root.yaml
+++ b/compliance/frameworks/cloud/aws_all_controls/root.yaml
@@ -1,5 +1,5 @@
 ID: aws_all_controls
-Title: "All Controls"
+Title: "All Controls - AWS"
 Description: "This benchmark contains all controls grouped by service to help you
   detect resource configurations that do not meet best practices."
 SectionCode: "aws_all_controls"
diff --git a/compliance/frameworks/cloud/aws_cis_v300/root.yaml b/compliance/frameworks/cloud/aws_cis_v300/root.yaml
index 22a46c0a0..a9aedfc7f 100755
--- a/compliance/frameworks/cloud/aws_cis_v300/root.yaml
+++ b/compliance/frameworks/cloud/aws_cis_v300/root.yaml
@@ -1,5 +1,5 @@
 ID: aws_cis_v300
-Title: "CIS v3.0.0"
+Title: "AWS CIS v3.0.0"
 Description: "The CIS Amazon Web Services Foundations Benchmark provides prescriptive
   guidance for configuring security options for a subset of Amazon Web Services with
   an emphasis on foundational, testable, and architecture agnostic settings."
diff --git a/compliance/frameworks/cloud/aws_nist_csf/root.yaml b/compliance/frameworks/cloud/aws_nist_csf/root.yaml
index 42d96fedc..0f0137993 100755
--- a/compliance/frameworks/cloud/aws_nist_csf/root.yaml
+++ b/compliance/frameworks/cloud/aws_nist_csf/root.yaml
@@ -1,5 +1,5 @@
 ID: aws_nist_csf
-Title: "NIST Cybersecurity Framework (CSF) v1.1"
+Title: "AWS NIST Cybersecurity Framework (CSF) v1.1"
 Description: "NIST Cybersecurity Framework is a set of best practices, standards,
   and recommendations that help an organization improve its cybersecurity measures."
 SectionCode: "aws_nist_csf"
@@ -26,6 +26,6 @@ Tags:
   type:
   - Benchmark
 Enabled: true
-AutoAssign: false
+AutoAssign: true
 Controls: []
 TracksDriftEvents: false
diff --git a/compliance/frameworks/cloud/aws_soc_2/root.yaml b/compliance/frameworks/cloud/aws_soc_2/root.yaml
index 150094318..cbf355a93 100755
--- a/compliance/frameworks/cloud/aws_soc_2/root.yaml
+++ b/compliance/frameworks/cloud/aws_soc_2/root.yaml
@@ -1,5 +1,5 @@
 ID: aws_soc_2
-Title: "SOC 2"
+Title: "AWS SOC 2"
 Description: "System and Organization Controls (SOC) 2 is an auditing procedure that
   ensures a company's data is securely managed. AWS Audit Manager provides
   a prebuilt framework that supports SOC 2 to assist you with your audit preparation."
@@ -32,7 +32,7 @@ Tags:
   - "true"
   type:
   - Benchmark
-Enabled: false
-AutoAssign: false
+Enabled: true
+AutoAssign: true
 Controls: []
 TracksDriftEvents: false
diff --git a/compliance/frameworks/cloud/azure_all_controls/root.yaml b/compliance/frameworks/cloud/azure_all_controls/root.yaml
index 28079e7dc..92bc7e6b8 100755
--- a/compliance/frameworks/cloud/azure_all_controls/root.yaml
+++ b/compliance/frameworks/cloud/azure_all_controls/root.yaml
@@ -1,5 +1,5 @@
 ID: azure_all_controls
-Title: "All Controls"
+Title: "All Controls - Azure"
 Description: "This benchmark contains all controls grouped by service to help you
   detect resource configurations that do not meet best practices."
 SectionCode: "azure_all_controls"