diff --git a/README.md b/README.md
index c792fb8b..4dbee9d7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <p align="center">
-  <img align="center" src="docs/img/prowler-pro-dark.png#gh-dark-mode-only" width="150" height="36">
-  <img align="center" src="docs/img/prowler-pro-light.png#gh-light-mode-only" width="15%" height="15%">
+  <img align="center" src="https://github.com/prowler-cloud/prowler/tree/prowler-3.0-dev/docs/img/prowler-pro-dark.png#gh-dark-mode-only" width="150" height="36">
+  <img align="center" src="https://github.com/prowler-cloud/prowler/tree/prowler-3.0-dev/docs/img/prowler-pro-light.png#gh-light-mode-only" width="15%" height="15%">
 </p>
 <p align="center">
   <b><i>&nbsp&nbsp&nbsp See all the things you and your team can do with ProwlerPro at <a href="https://prowler.pro">prowler.pro</a></i></b>
@@ -58,7 +58,7 @@ The container images are available here:
 
 You can run Prowler from your workstation, an EC2 instance, Fargate or any other container, Codebuild, CloudShell and Cloud9.
 
-![Architecture](docs/img/architecture.png)
+![Architecture](https://github.com/prowler-cloud/prowler/tree/prowler-3.0-dev/docs/img/architecture.png)
 
 # 📝 Requirements
 
@@ -98,7 +98,7 @@ To run prowler, you will need to specify the provider (e.g aws or azure):
 prowler <provider>
 ```
 
-![Prowler Execution](docs/img/short-display.png)
+![Prowler Execution](https://github.com/prowler-cloud/prowler/tree/prowler-3.0-dev/docs/img/short-display.png)
 
 > Running the `prowler` command without options will use your environment variable credentials.
 
diff --git a/prowler/config/config.yaml b/prowler/config/config.yaml
index 7e910979..79c28253 100644
--- a/prowler/config/config.yaml
+++ b/prowler/config/config.yaml
@@ -1,27 +1,31 @@
-# ec2_elastic_ip_shodan
+# AWS EC2 Configuration
+# aws.ec2_elastic_ip_shodan
 shodan_api_key: null
+# aws.ec2_securitygroup_with_many_ingress_egress_rules --> by default is 50 rules
+max_security_group_rules: 50
+# aws.ec2_instance_older_than_specific_days --> by default is 6 months (180 days)
+max_ec2_instance_age_in_days: 180
 
-# VPC Checks
+# AWS VPC Configuration (vpc_endpoint_connections_trust_boundaries, vpc_endpoint_services_allowed_principals_trust_boundaries)
 # Single account environment: No action required. The AWS account number will be automatically added by the checks.
 # Multi account environment: Any additional trusted account number should be added as a space separated list, e.g.
 # trusted_account_ids : ["123456789012", "098765432109", "678901234567"]
 trusted_account_ids: []
 
-# cloudwatch_log_group_retention_policy_specific_days_enabled --> by default is 365 days
+# AWS Cloudwatch Configuration
+# aws.cloudwatch_log_group_retention_policy_specific_days_enabled --> by default is 365 days
 log_group_retention_days: 365
 
-# ec2_securitygroup_with_many_ingress_egress_rules --> by default is 50 rules
-max_security_group_rules: 50
-
-# ec2_instance_older_than_specific_days --> by default is 6 months (180 days)
-max_ec2_instance_age_in_days: 180
-
-# AppStream Session Configuration
+# AWS AppStream Session Configuration
+# aws.appstream_fleet_session_idle_disconnect_timeout
 max_idle_disconnect_timeout_in_seconds: 600 # 10 Minutes
+# aws.appstream_fleet_session_disconnect_timeout
 max_disconnect_timeout_in_seconds: 300 # 5 Minutes
+# aws.appstream_fleet_maximum_session_duration
 max_session_duration_seconds: 36000 # 10 Hours
 
-# Lambda Configuration
+# AWS Lambda Configuration
+# aws.awslambda_function_using_supported_runtimes
 obsolete_lambda_runtimes:
   [
     "python3.6",