diff --git a/PowerShell/ScubaGear/Sample-Config-Files/aad-config.yaml b/PowerShell/ScubaGear/Sample-Config-Files/aad-config.yaml
index 716ffb557a..a90eb07ca5 100644
--- a/PowerShell/ScubaGear/Sample-Config-Files/aad-config.yaml
+++ b/PowerShell/ScubaGear/Sample-Config-Files/aad-config.yaml
@@ -42,11 +42,12 @@ Aad:
   MS.AAD.2.3v1: *CommonExclusions
   MS.AAD.3.1v1: *CommonExclusions
   MS.AAD.3.2v1: *CommonExclusions
+  MS.AAD.3.6v1: *CommonExclusions
+  MS.AAD.3.7v1: *CommonExclusions
+  MS.AAD.3.8v1: *CommonExclusions
   MS.AAD.7.4v1: &CommonRoleExclusions
     RoleExclusions:
       Users:
         - 2a8adc58-b7c5-4086-a5cc-244b8df40ce8
       Groups:
         - 4a471183-d934-4fb4-b1b3-d9525e0e1b45
-# SharePoint:
-# Teams:
diff --git a/PowerShell/ScubaGear/Sample-Config-Files/basic_config.yaml b/PowerShell/ScubaGear/Sample-Config-Files/basic_config.yaml
index 071caf976b..627b032fe9 100644
--- a/PowerShell/ScubaGear/Sample-Config-Files/basic_config.yaml
+++ b/PowerShell/ScubaGear/Sample-Config-Files/basic_config.yaml
@@ -1,3 +1,6 @@
-Description: YAML Basic Configuration file ( one product )
+Description: |
+  YAML Basic Configuration file ( one product )
+  This example includes the following design choice for illustrative purposes:
+  - Use of Pascal case convention for variable names
 ProductNames: teams
 M365Environment: gcc
diff --git a/PowerShell/ScubaGear/Sample-Config-Files/creds_config.yaml b/PowerShell/ScubaGear/Sample-Config-Files/creds_config.yaml
index 0b13b0a76a..ab76c5d187 100644
--- a/PowerShell/ScubaGear/Sample-Config-Files/creds_config.yaml
+++ b/PowerShell/ScubaGear/Sample-Config-Files/creds_config.yaml
@@ -1,10 +1,10 @@
-Description: YAML Configuration file with dummy authentication parameters
+Description: |
+  YAML Configuration file with dummy authentication parameters, demonstrates format of what the authentication parameters should look like for your tenant
+  This example includes the following design choices for illustrative purposes:
+  - Use of Pascal case convention for variable names
 ProductNames:
-  - teams
-  # - exo
-  # - defender
   - aad
-  # - sharepoint
+  - teams
 M365Environment: commercial
 Organization: abcdef.example.com
 AppID: 0123456789abcdef01234566789abcde
diff --git a/PowerShell/ScubaGear/Sample-Config-Files/full_config.yaml b/PowerShell/ScubaGear/Sample-Config-Files/full_config.yaml
index 0eb415c635..2fa6b4fab8 100644
--- a/PowerShell/ScubaGear/Sample-Config-Files/full_config.yaml
+++ b/PowerShell/ScubaGear/Sample-Config-Files/full_config.yaml
@@ -1,10 +1,15 @@
-Description: YAML Configuration file with all parameters
+Description: |
+  YAML Configuration file with all parameters
+  This config file does not include any custom variables or any per product namespace variables.  The file shows all global configuration file variables with their default values .  Users can override these values as needed.  Global variables can be omitted from the file if the default is desired.  Global variables specified in the configuration file can also be overridden if given as command line parameters.
+  For more specific per product config variables please refer to the sample config associated with that product
+  This example includes the following design choices for illustrative purposes:
+  - Use of Pascal case convention for variable names
 ProductNames:
-  - teams
-  - exo
-  - defender
   - aad
+  - defender
+  - exo
   - sharepoint
+  - teams
 M365Environment: commercial
 OPAPath: .
 LogIn: true
diff --git a/PowerShell/ScubaGear/Sample-Config-Files/sample-config.yaml b/PowerShell/ScubaGear/Sample-Config-Files/sample-config.yaml
index 9de0222ed7..cf8165e1e1 100644
--- a/PowerShell/ScubaGear/Sample-Config-Files/sample-config.yaml
+++ b/PowerShell/ScubaGear/Sample-Config-Files/sample-config.yaml
@@ -1,4 +1,10 @@
-Description: YAML Configuration file for unit test in SCuBA
+Description: |
+  YAML Configuration file for unit test in SCuBA
+  This config file does not include any per product namespace variables
+  For more specific per product config variables please refer to the sample config associated with that product
+  This example includes the following design choices for illustrative purposes:
+  - Use of Pascal case convention for variable names
+  - Example use of a custom variable
 ProductNames:
   - teams
   - exo
diff --git a/PowerShell/ScubaGear/Sample-Config-Files/typical_config.yaml b/PowerShell/ScubaGear/Sample-Config-Files/typical_config.yaml
index 14feabe1aa..861bd2163a 100644
--- a/PowerShell/ScubaGear/Sample-Config-Files/typical_config.yaml
+++ b/PowerShell/ScubaGear/Sample-Config-Files/typical_config.yaml
@@ -1,8 +1,12 @@
-Description: YAML Typical Configuration File ( multiple products )
+Description: |
+  YAML Typical Configuration File ( multiple products )
+  Some names are commented out but for completeness are left in to show all product options
+  This example includes the following design choices for illustrative purposes:
+  - Use of Pascal case convention for variable names
 ProductNames:
-  - teams
-  # - exo
-  # - defender
   - aad
+  # - defender
+  # - exo
   # - sharepoint
+  - teams
 M365Environment: gcc