diff --git a/.github/files/galaxy.yml.j2 b/.github/files/galaxy.yml.j2
index eb37131e5..a99fee6bc 100644
--- a/.github/files/galaxy.yml.j2
+++ b/.github/files/galaxy.yml.j2
@@ -21,6 +21,9 @@ build_ignore:
     - tests/*
 license:
     - GPL-3.0-or-later
+dependencies:
+    "ansible.eda": ">=2.2.0"
+    "ansible.hub": ">=1.0.0"
 tags:
     - controller
     - collection
diff --git a/CONVERSION_GUIDE.md b/CONVERSION_GUIDE.md
new file mode 100644
index 000000000..81cf4d768
--- /dev/null
+++ b/CONVERSION_GUIDE.md
@@ -0,0 +1,128 @@
+# AAP Configuration conversion guide
+
+## Background
+
+This is documentation on how to use convert from the older infra collections to the aap_configuration collection.
+
+Previously there were multiple collections
+infra.controller_configuration
+infra.ah_configuration
+infra.eda_configuration
+
+These have been combined along with new roles to configure the gateway aspect of AAP.
+
+It is recomended to use the old collections when interacting with the Ansible Automation Platforms with versions 2.4 or prior. While some aspects of the collection may work, it can have unintended changes or behaviors.
+The collections have been revamped to use a single set of connection variables and to standardize variables throughout the collections.
+
+This guide will go through some of the standard variables what they were before and what to change them to.
+
+## Basics
+
+This collection requires other collections to be used. These collections mainly house the roles to wrap around the official certified collections. While these validated collections are not certified or have a level of support, volunteers spend their free time to maintain them, and to try and address any issues that arise quickly.
+
+These collections are
+
+- [ansible.eda](https://console.redhat.com/ansible/automation-hub/repo/published/ansible/eda/) or [upstream](https://galaxy.ansible.com/ui/repo/published/ansible/eda/)
+- [ansible.hub](https://console.redhat.com/ansible/automation-hub/repo/published/ansible/hub/) or [upstream](https://galaxy.ansible.com/ui/repo/published/ansible/hub/)
+- [ansible.controller](https://console.redhat.com/ansible/automation-hub/repo/published/ansible/controller/) or [awx.awx](https://galaxy.ansible.com/ui/repo/published/awx/awx/)
+- [ansible.platform(Gateway collection)](https://console.redhat.com/ansible/automation-hub/repo/published/ansible/platform/)
+
+These collections are required for this collection to work, While ansible.controller and ansible.gateway are only available from [https://console.redhat.com/](https://console.redhat.com/).
+
+## Connection and Global Variables
+
+These are the variables that are used to connecto the platfrom and are the same accross all Roles. Various environment variables can be used as specfied by their module collections, but it is recomended to use ansible vars as they can be homogonized to be single variables.
+
+### Connection Variables
+
+These are the connection variables, These are used to connect to the platform.
+
+|Variable Name|Default Value|Required|Description|
+|:---|:---:|:---:|:---|:---|
+|`aap_hostname`|""|yes|URL to the Ansible Automation Platform Server.|127.0.0.1|
+|`aap_validate_certs`|`True`|no|Whether or not to validate the Ansible Automation Platform Server's SSL certificate.||
+|`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
+|`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
+|`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
+
+### Global Variables
+
+Other Variables that will apply to all roles when used globally. Each of these has a per role that can override the default value if you wish to selectivly use them. This is useful for things like retries and delay on projects, or secure logging for a role.
+
+|Variable Name|Default Value|Required|Description|
+|:---|:---:|:---:|:---|:---|
+|`aap_configuration_enforce_defaults`|`False`|no|Whether or not to enforce default option values. This is not universal and it is a best effort to enforce the default values of fields.|
+|`aap_configuration_secure_logging`|`False`|no|Whether or not to include the sensitive Registry role tasks in the log.  Set this value to `True` if you will be providing your sensitive values from elsewhere.|
+|`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for each role globally.|
+|`aap_configuration_async_delay`|1|no|This sets the delay between retries for each role globally.|
+|`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for each role globally.|
+|`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|
+
+## Role variables
+
+The order these variables and roles get applied by the dispatch role are
+Gateway -> Hub -> Controller -> EDA
+
+Below listed are the top level variables for each object in the order they are run by the dispatch role. Also included are the previous values if applicable
+
+gateway_configuration vars:
+
+- gateway_authenticators
+- gateway_authenticator_maps
+- gateway_settings
+- aap_applications
+- http_ports
+- aap_organizations
+- gateway_service_nodes
+- gateway_gateway_service_keys
+- gateway_service_clusters
+- gateway_services
+- gateway_role_user_assignments
+- gateway_routes
+- aap_teams
+
+ah_configuration vars:
+
+- aap_teams <- ah_groups
+- aap_user_accounts <- ah_users
+- ah_namespaces
+- ah_collections
+- ah_ee_registries
+- ah_ee_repositories
+- ah_ee_images
+- ah_collection_remotes
+- ah_collection_repositories
+
+controller_configuration vars:
+
+- controller_settings
+- aap_organizations < - controller_organizations
+- controller_instances
+- controller_instance_groups
+- controller_labels
+- controller_credential_types
+- controller_credentials
+- controller_credential_input_sources
+- controller_execution_environments
+- aap_applications < - controller_applications
+- controller_notifications
+- controller_projects
+- controller_inventories
+- controller_inventory_sources
+- controller_inventory_sources
+- controller_hosts
+- controller_bulk_hosts
+- controller_templates
+- controller_workflows
+- controller_schedules
+- controller_launch_jobs
+- controller_workflow_launch_jobs
+
+eda_configuration vars:
+
+- eda_credentials
+- eda_controller_tokens
+- eda_projects
+- eda_decision_environments
+- eda_rulebook_activations
diff --git a/galaxy.yml b/galaxy.yml
index a63f5ce41..28f55012a 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -21,6 +21,9 @@ build_ignore:
     - tests/*
 license:
     - GPL-3.0-or-later
+dependencies:
+    "ansible.eda": ">=2.2.0"
+    "ansible.hub": ">=1.0.0"
 tags:
     - controller
     - collection
diff --git a/roles/controller_ad_hoc_command/README.md b/roles/controller_ad_hoc_command/README.md
index 8a4d198db..76a0f151e 100644
--- a/roles/controller_ad_hoc_command/README.md
+++ b/roles/controller_ad_hoc_command/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_ad_hoc_commands`|`see below`|yes|Data structure describing your ad hoc commands to run Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/controller_ad_hoc_command_cancel/README.md b/roles/controller_ad_hoc_command_cancel/README.md
index 7515b8eaf..424d535e2 100644
--- a/roles/controller_ad_hoc_command_cancel/README.md
+++ b/roles/controller_ad_hoc_command_cancel/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_ad_hoc_commands_cancel`|`see below`|yes|Data structure describing your ad hoc jobs to cancel Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/controller_applications/README.md b/roles/controller_applications/README.md
index 28515ac19..09e58223c 100644
--- a/roles/controller_applications/README.md
+++ b/roles/controller_applications/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`aap_applications`|`see below`|yes|Data structure describing your applications, described below. Alias: applications ||
 
 ### Enforcing defaults
diff --git a/roles/controller_bulk_host_create/README.md b/roles/controller_bulk_host_create/README.md
index 611ff54b4..2277c6a3a 100644
--- a/roles/controller_bulk_host_create/README.md
+++ b/roles/controller_bulk_host_create/README.md
@@ -21,7 +21,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
 |`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`controller_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`controller_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_configuration_bulk_hosts_secure_logging`|`see below`|yes|Data structure describing your organization or organizations Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/controller_bulk_job_launch/README.md b/roles/controller_bulk_job_launch/README.md
index 53c60b595..378464425 100644
--- a/roles/controller_bulk_job_launch/README.md
+++ b/roles/controller_bulk_job_launch/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_bulk_launch_jobs`|`see below`|yes|Data structure describing your organization or organizations Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/controller_credential_input_sources/README.md b/roles/controller_credential_input_sources/README.md
index d8c5ef580..77661e53b 100644
--- a/roles/controller_credential_input_sources/README.md
+++ b/roles/controller_credential_input_sources/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_credential_input_sources`|`see below`|yes|Data structure describing your credential input sources Described below.||
 
 ### Enforcing defaults
diff --git a/roles/controller_credential_types/README.md b/roles/controller_credential_types/README.md
index a1f2e3cd0..c16710bd7 100644
--- a/roles/controller_credential_types/README.md
+++ b/roles/controller_credential_types/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_credential_types`|`see below`|yes|Data structure describing your credential types Described below. Alias: credential_types ||
 
 ### Enforcing defaults
diff --git a/roles/controller_credentials/README.md b/roles/controller_credentials/README.md
index 234708b86..1a2d9294a 100644
--- a/roles/controller_credentials/README.md
+++ b/roles/controller_credentials/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_credentials`|`see below`|yes|Data structure describing your credentials Described below. Alias: credentials ||
 
 ### Enforcing defaults
diff --git a/roles/controller_execution_environments/README.md b/roles/controller_execution_environments/README.md
index 6ed41a1b2..893a34cc9 100644
--- a/roles/controller_execution_environments/README.md
+++ b/roles/controller_execution_environments/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_execution_environments`|`see below`|yes|Data structure describing your organization or organizations Described below. Alias: execution_environments ||
 
 ### Enforcing defaults
diff --git a/roles/controller_host_groups/README.md b/roles/controller_host_groups/README.md
index 80f093c10..4b8f4154b 100644
--- a/roles/controller_host_groups/README.md
+++ b/roles/controller_host_groups/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_groups`|`see below`|yes|Data structure describing your group or groups Described below.||
 
 ### Enforcing defaults
diff --git a/roles/controller_hosts/README.md b/roles/controller_hosts/README.md
index 00aa48fe7..162a78cff 100644
--- a/roles/controller_hosts/README.md
+++ b/roles/controller_hosts/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_hosts`|`see below`|yes|Data structure describing your host entries described below.||
 
 ### Enforcing defaults
diff --git a/roles/controller_instance_groups/README.md b/roles/controller_instance_groups/README.md
index 85917de1f..a4273b69e 100644
--- a/roles/controller_instance_groups/README.md
+++ b/roles/controller_instance_groups/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_instance_groups`|`see below`|yes|Data structure describing your instance groups Described below.||
 
 ### Enforcing defaults
diff --git a/roles/controller_instances/README.md b/roles/controller_instances/README.md
index f17af3c71..d2e002c45 100644
--- a/roles/controller_instances/README.md
+++ b/roles/controller_instances/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_instances`|`see below`|yes|Data structure describing your instances Described below.||
 
 ### Enforcing defaults
diff --git a/roles/controller_inventories/README.md b/roles/controller_inventories/README.md
index b60c38d8d..cfa95eadb 100644
--- a/roles/controller_inventories/README.md
+++ b/roles/controller_inventories/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_inventories`|`see below`|yes|Data structure describing your inventories described below. Alias: inventory ||
 
 ### Enforcing defaults
diff --git a/roles/controller_inventory_source_update/README.md b/roles/controller_inventory_source_update/README.md
index 53a7f37d6..796967699 100644
--- a/roles/controller_inventory_source_update/README.md
+++ b/roles/controller_inventory_source_update/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_inventory_sources`|`see below`|yes|Data structure describing controller inventory sources to update Described below. Alias: inventory_sources ||
 
 ### Secure Logging Variables
diff --git a/roles/controller_inventory_sources/README.md b/roles/controller_inventory_sources/README.md
index 9e5d09d54..2d335da64 100644
--- a/roles/controller_inventory_sources/README.md
+++ b/roles/controller_inventory_sources/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_inventory_sources`|`see below`|yes|Data structure describing your inventory sources Described below. Alias: inventory_sources ||
 
 ### Enforcing defaults
diff --git a/roles/controller_job_launch/README.md b/roles/controller_job_launch/README.md
index 23d41de0d..cada2144d 100644
--- a/roles/controller_job_launch/README.md
+++ b/roles/controller_job_launch/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_launch_jobs`|`see below`|yes|Data structure describing the jobs to launch Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/controller_job_templates/README.md b/roles/controller_job_templates/README.md
index 9db0ac7b9..131d21769 100644
--- a/roles/controller_job_templates/README.md
+++ b/roles/controller_job_templates/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_templates`|`see below`|yes|Data structure describing your job template or job templates Described below. Alias: job_templates ||
 
 ### Enforcing defaults
diff --git a/roles/controller_jobs_cancel/README.md b/roles/controller_jobs_cancel/README.md
index 62440eb0e..b09e0f8ef 100644
--- a/roles/controller_jobs_cancel/README.md
+++ b/roles/controller_jobs_cancel/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_cancel_jobs`|`see below`|yes|Data structure describing jobs to cancel Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/controller_labels/README.md b/roles/controller_labels/README.md
index 1a17353f2..ba0dcc1eb 100644
--- a/roles/controller_labels/README.md
+++ b/roles/controller_labels/README.md
@@ -20,7 +20,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_labels`|`see below`|yes|Data structure describing your label or labels Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/controller_license/README.md b/roles/controller_license/README.md
index 31854dd55..b6c923bd4 100644
--- a/roles/controller_license/README.md
+++ b/roles/controller_license/README.md
@@ -24,7 +24,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_license`|`see below`|yes|Data structure describing your license for controller, described below.||
 |`redhat_subscription_username`|""|no|Red Hat or Red Hat Satellite username to get available subscriptions. Used only for Subscription lookup implementation.||
 |`redhat_subscription_password`|""|no|Red Hat or Red Hat Satellite password to get available subscriptions. Used only for Subscription lookup implementation.||
diff --git a/roles/controller_notification_templates/README.md b/roles/controller_notification_templates/README.md
index 0fc3f2faf..a19a18437 100644
--- a/roles/controller_notification_templates/README.md
+++ b/roles/controller_notification_templates/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_notifications`|`see below`|yes|Data structure describing your notification entries described below. Alias: notification_templates ||
 
 ### Enforcing defaults
diff --git a/roles/controller_organizations/README.md b/roles/controller_organizations/README.md
index e7c706e5f..608eb1182 100644
--- a/roles/controller_organizations/README.md
+++ b/roles/controller_organizations/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`aap_organizations`|`see below`|yes|Data structure describing your organization or organizations Described below. Alias: organizations ||
 |`assign_galaxy_credentials_to_org`|`true`|no|Boolean to indicate whether credentials should be assigned or not. It should be noted that credentials must exist before adding it. The dispatch role will set this to `false`, before re-running the role with it set to `true`. ||
 |`assign_default_ee_to_org`|`true`|no|Boolean to indicate whether default execution environment should be assigned or not. It should be noted that execution environment must exist before adding it. The dispatch role will set this to `false`, before re-running the role with it set to `true`. ||
diff --git a/roles/controller_project_update/README.md b/roles/controller_project_update/README.md
index cd5995b78..04bb5b7d8 100644
--- a/roles/controller_project_update/README.md
+++ b/roles/controller_project_update/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_projects`|`see below`|yes|Data structure describing the project to update Described below. Alias: projects ||
 
 ### Secure Logging Variables
diff --git a/roles/controller_projects/README.md b/roles/controller_projects/README.md
index b828d1753..81a2c686d 100644
--- a/roles/controller_projects/README.md
+++ b/roles/controller_projects/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|str|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|str|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
 |`controller_oauthtoken`|""|no|str|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`controller_request_timeout`|`10`|no|int|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`controller_request_timeout`|`10`|no|int|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_projects`|`see below`|yes|str|Data structure describing your project or projects Described below. Alias: projects ||
 
 ### Enforcing defaults
diff --git a/roles/controller_roles/README.md b/roles/controller_roles/README.md
index a882e0303..168e92657 100644
--- a/roles/controller_roles/README.md
+++ b/roles/controller_roles/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_roles`|`see below`|yes|Data structure describing your RBAC entries described below.||
 
 ### Enforcing defaults
diff --git a/roles/controller_schedules/README.md b/roles/controller_schedules/README.md
index 6161c23a3..3d95a3162 100644
--- a/roles/controller_schedules/README.md
+++ b/roles/controller_schedules/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_schedules`|`see below`|yes|Data structure describing your schedule or schedules Described below. Alias: schedules ||
 
 ### Enforcing defaults
diff --git a/roles/controller_settings/README.md b/roles/controller_settings/README.md
index ab801c1bd..0ac6bee95 100644
--- a/roles/controller_settings/README.md
+++ b/roles/controller_settings/README.md
@@ -20,7 +20,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_settings`|`see below`|yes|Data structure describing your settings described below.||
 
 ### Secure Logging Variables
diff --git a/roles/controller_teams/README.md b/roles/controller_teams/README.md
index 28946df86..e2645dd8b 100644
--- a/roles/controller_teams/README.md
+++ b/roles/controller_teams/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`aap_teams`|`see below`|yes|Data structure describing your Teams described below. Alias: teams ||
 
 ### Enforcing defaults
diff --git a/roles/controller_users/README.md b/roles/controller_users/README.md
index ae922f95c..70bc8389d 100644
--- a/roles/controller_users/README.md
+++ b/roles/controller_users/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`aap_user_accounts`|`see below`|yes|Data structure describing your user entries described below.  Alias: users ||
 |`controller_user_default_password`|""|no|Global variable to set the password for all users.||
 
diff --git a/roles/controller_workflow_job_templates/README.md b/roles/controller_workflow_job_templates/README.md
index fda4a4367..94f8f1eb9 100644
--- a/roles/controller_workflow_job_templates/README.md
+++ b/roles/controller_workflow_job_templates/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_workflows`|`see below`|yes|Data structure describing your workflow job templates described below. Alias: workflow_job_templates ||
 
 ### Enforcing defaults
diff --git a/roles/controller_workflow_launch/README.md b/roles/controller_workflow_launch/README.md
index 602509ef6..5b7b3ba7a 100644
--- a/roles/controller_workflow_launch/README.md
+++ b/roles/controller_workflow_launch/README.md
@@ -22,7 +22,7 @@ Currently:
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`controller_workflow_launch_jobs`|`see below`|yes|Data structure describing workflow or workflows to launch Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/dispatch/defaults/main.yml b/roles/dispatch/defaults/main.yml
index 44b506fd3..b24997269 100644
--- a/roles/dispatch/defaults/main.yml
+++ b/roles/dispatch/defaults/main.yml
@@ -10,7 +10,7 @@ gateway_configuration_dispatcher_roles:
     var: gateway_settings
     tags: settings
   - role: gateway_applications
-    var: gateway_applications
+    var: aap_applications
     tags: applications
   - role: gateway_http_ports
     var: http_ports_list
diff --git a/roles/eda_controller_tokens/README.md b/roles/eda_controller_tokens/README.md
index 891e8e8fb..575020c5b 100644
--- a/roles/eda_controller_tokens/README.md
+++ b/roles/eda_controller_tokens/README.md
@@ -12,10 +12,10 @@ Note that tokens cannot be updated, only created.
 |`eda_host`|""|yes|URL to the EDA Controller (alias: `eda_hostname`)|127.0.0.1|
 |`aap_username`|""|yes|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|yes|Platform Admin User's password on the EDA Controller Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
-
 |`aap_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Platform Server's SSL certificate.||
 |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Automation Platform host.||
 |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`eda_controller_tokens`|`see below`|yes|Data structure describing your user tokens, described below.||
 
 ### Secure Logging Variables
diff --git a/roles/eda_credentials/README.md b/roles/eda_credentials/README.md
index 89fd491d9..a03b214e3 100644
--- a/roles/eda_credentials/README.md
+++ b/roles/eda_credentials/README.md
@@ -11,10 +11,10 @@ An Ansible Role to create Credentials in EDA Controller.
 |`eda_host`|""|yes|URL to the EDA Controller (alias: `eda_hostname`)|127.0.0.1|
 |`aap_username`|""|yes|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|yes|Platform Admin User's password on the EDA Controller Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
-
 |`aap_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Platform Server's SSL certificate.||
 |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Automation Platform host.||
 |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`eda_credentials`|`see below`|yes|Data structure describing your credentials, described below.||
 
 ### Secure Logging Variables
diff --git a/roles/eda_decision_environments/README.md b/roles/eda_decision_environments/README.md
index a1c9ed7c4..23fef86f7 100644
--- a/roles/eda_decision_environments/README.md
+++ b/roles/eda_decision_environments/README.md
@@ -15,6 +15,7 @@ An Ansible Role to create Decision Environments in EDA Controller.
 |`aap_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Platform Server's SSL certificate.||
 |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Automation Platform host.||
 |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`eda_decision_environments`|`see below`|yes|Data structure describing your decision environments, described below.||
 
 ### Secure Logging Variables
diff --git a/roles/eda_projects/README.md b/roles/eda_projects/README.md
index 51d75fcc2..cad7511d1 100644
--- a/roles/eda_projects/README.md
+++ b/roles/eda_projects/README.md
@@ -15,6 +15,7 @@ An Ansible Role to create Projects in EDA Controller.
 |`aap_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Platform Server's SSL certificate.||
 |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Automation Platform host.||
 |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`eda_projects`|`see below`|yes|Data structure describing your projects, described below.||
 
 ### Secure Logging Variables
diff --git a/roles/eda_rulebook_activations/README.md b/roles/eda_rulebook_activations/README.md
index 9abfcc1aa..39c0e7c51 100644
--- a/roles/eda_rulebook_activations/README.md
+++ b/roles/eda_rulebook_activations/README.md
@@ -15,6 +15,7 @@ An Ansible Role to create rulebook activations in EDA Controller.
 |`aap_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Platform Server's SSL certificate.||
 |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Automation Platform host.||
 |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`eda_rulebook_activations`|`see below`|yes|Data structure describing your rulebook activations, described below.||
 
 ### Secure Logging Variables
diff --git a/roles/eda_users/README.md b/roles/eda_users/README.md
index 5c4fe0bfc..c0cf86335 100644
--- a/roles/eda_users/README.md
+++ b/roles/eda_users/README.md
@@ -11,10 +11,10 @@ An Ansible Role to create users in EDA Controller.
 |`eda_host`|""|yes|URL to the EDA Controller (alias: `eda_hostname`)|127.0.0.1|
 |`aap_username`|""|yes|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|yes|Platform Admin User's password on the EDA Controller Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
-
 |`aap_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Platform Server's SSL certificate.||
 |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Automation Platform host.||
 |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`eda_users`|`see below`|yes|Data structure describing your users, described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_applications/README.md b/roles/gateway_applications/README.md
index d7b36c86d..5c0247f3c 100644
--- a/roles/gateway_applications/README.md
+++ b/roles/gateway_applications/README.md
@@ -14,7 +14,7 @@ An Ansible Role to create/update/remove Applications on Ansible gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`aap_applications`|`see below`|yes|Data structure describing your aap_applications Described below.||
 
 ### Enforcing defaults
diff --git a/roles/gateway_authenticator_maps/README.md b/roles/gateway_authenticator_maps/README.md
index e9a129871..5eed05ed6 100644
--- a/roles/gateway_authenticator_maps/README.md
+++ b/roles/gateway_authenticator_maps/README.md
@@ -14,7 +14,7 @@ An Ansible Role to add Authenticator Maps on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_authenticator_maps`|`see below`|yes|Data structure describing your gateway_authenticator_maps Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_authenticators/README.md b/roles/gateway_authenticators/README.md
index 7a40ec711..e096aac43 100644
--- a/roles/gateway_authenticators/README.md
+++ b/roles/gateway_authenticators/README.md
@@ -14,7 +14,7 @@ An Ansible Role to add Authenticators on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_authenticators`|`see below`|yes|Data structure describing your gateway_authenticators Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_http_ports/README.md b/roles/gateway_http_ports/README.md
index c862fdea9..f1aaf8f4d 100644
--- a/roles/gateway_http_ports/README.md
+++ b/roles/gateway_http_ports/README.md
@@ -14,7 +14,7 @@ An Ansible Role to add proxy Http Ports on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_http_ports`|`see below`|yes|Data structure describing your http_ports entries Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_organizations/README.md b/roles/gateway_organizations/README.md
index 9837c5417..d3d0a6db9 100644
--- a/roles/gateway_organizations/README.md
+++ b/roles/gateway_organizations/README.md
@@ -14,7 +14,7 @@ An Ansible Role to add Organizations on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`aap_organizations`|`see below`|yes|Data structure describing your organizations Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_role_user_assignments/README.md b/roles/gateway_role_user_assignments/README.md
index 0d3489d5d..42b101930 100644
--- a/roles/gateway_role_user_assignments/README.md
+++ b/roles/gateway_role_user_assignments/README.md
@@ -14,7 +14,7 @@ An Ansible Role to give a user permission to a resource like an organization.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_role_user_assignments`|`see below`|yes|Data structure describing your gateway_role_user_assignment Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_role_user_assignments/tasks/main.yml b/roles/gateway_role_user_assignments/tasks/main.yml
index 018b546cc..466423758 100644
--- a/roles/gateway_role_user_assignments/tasks/main.yml
+++ b/roles/gateway_role_user_assignments/tasks/main.yml
@@ -15,7 +15,7 @@
     gateway_token: "{{ aap_token | default(omit, true) }}"
     gateway_request_timeout: "{{ aap_request_timeout | default(omit, true) }}"
     gateway_validate_certs: "{{ aap_validate_certs | default(omit) }}"
-  loop: "{{ role_user_assignments if role_user_assignments is defined else role_user_assignments_list }}"
+  loop: "{{ gateway_role_user_assignments }}"
   loop_control:
     loop_var: __gateway_role_user_assignments_item
   no_log: "{{ role_user_assignments_secure_logging }}"
diff --git a/roles/gateway_routes/README.md b/roles/gateway_routes/README.md
index 24323c552..f0ae9a783 100644
--- a/roles/gateway_routes/README.md
+++ b/roles/gateway_routes/README.md
@@ -16,7 +16,7 @@ http port and path in the destination service (gateway, controller, hub, eda).
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_routes`|`see below`|yes|Data structure describing your gateway_routes Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_service_clusters/README.md b/roles/gateway_service_clusters/README.md
index 1e7beeaab..316d84bc7 100644
--- a/roles/gateway_service_clusters/README.md
+++ b/roles/gateway_service_clusters/README.md
@@ -14,7 +14,7 @@ An Ansible Role to configure Service Clusters on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_service_clusters`|`see below`|yes|Data structure describing your gateway_service_clusters Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_service_keys/README.md b/roles/gateway_service_keys/README.md
index ddaf24571..a8dae81d2 100644
--- a/roles/gateway_service_keys/README.md
+++ b/roles/gateway_service_keys/README.md
@@ -14,7 +14,7 @@ An Ansible Role to configure Service Keys on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_gateway_service_keys`|`see below`|yes|Data structure describing your gateway_gateway_service_keys Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_service_nodes/README.md b/roles/gateway_service_nodes/README.md
index 6683b548a..fa5647b58 100644
--- a/roles/gateway_service_nodes/README.md
+++ b/roles/gateway_service_nodes/README.md
@@ -14,7 +14,7 @@ An Ansible Role to configure Service Nodes on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_service_nodes`|`see below`|yes|Data structure describing your gateway_service_nodes Described below.||
 
 ### Enforcing defaults
diff --git a/roles/gateway_services/README.md b/roles/gateway_services/README.md
index 282bd530c..0c7b37230 100644
--- a/roles/gateway_services/README.md
+++ b/roles/gateway_services/README.md
@@ -16,7 +16,7 @@ http port and path in the destination service (gateway, controller, hub, eda).
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_services`|`see below`|yes|Data structure describing your gateway_services Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_settings/README.md b/roles/gateway_settings/README.md
index 9b017e7c2..6874a3743 100644
--- a/roles/gateway_settings/README.md
+++ b/roles/gateway_settings/README.md
@@ -12,7 +12,7 @@ An Ansible role to alter Settings on Ansible Automation Gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`gateway_settings`|`see below`|yes|Data structure describing your gateway_services Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_teams/README.md b/roles/gateway_teams/README.md
index 6f4b7431e..205d1a1e3 100644
--- a/roles/gateway_teams/README.md
+++ b/roles/gateway_teams/README.md
@@ -14,7 +14,7 @@ An Ansible Role to add Teams on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`aap_teams`|`see below`|yes|Data structure describing your teams Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/gateway_users/README.md b/roles/gateway_users/README.md
index b87a5f8a2..f14ab6312 100644
--- a/roles/gateway_users/README.md
+++ b/roles/gateway_users/README.md
@@ -14,7 +14,7 @@ An Ansible Role to configure users on Ansible Automation gateway.
 |`aap_username`|""|no|Admin User on the Ansible Automation Platform Server. Either username / password or oauthtoken need to be specified.||
 |`aap_password`|""|no|Platform Admin User's password on the Server.  This should be stored in an Ansible Vault at vars/platform-secrets.yml or elsewhere and called from a parent playbook.||
 |`aap_token`|""|no|Controller Admin User's token on the Ansible Automation Platform Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
-|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the controller host.||
+|`aap_request_timeout`|`10`|no|Specify the timeout in seconds Ansible should use in requests to the Ansible Automation Platform host.||
 |`aap_user_accounts`|`see below`|yes|Data structure describing your users Described below.||
 
 ### Secure Logging Variables
diff --git a/roles/hub_group/defaults/main.yml b/roles/hub_group/defaults/main.yml
index 90e38a937..98ba38f92 100644
--- a/roles/hub_group/defaults/main.yml
+++ b/roles/hub_group/defaults/main.yml
@@ -9,7 +9,7 @@
 # These are the default variables specific to the license role
 
 # a list of dictionaries describing the Automation Hub groups
-ah_groups: []
+aap_teams: []
 # possible fields:
 #  - name
 #  - perms
diff --git a/roles/hub_group/meta/argument_specs.yml b/roles/hub_group/meta/argument_specs.yml
index 87f22e952..aab231ec0 100644
--- a/roles/hub_group/meta/argument_specs.yml
+++ b/roles/hub_group/meta/argument_specs.yml
@@ -3,7 +3,7 @@ argument_specs:
   main:
     short_description: An Ansible Role to create groups in Automation Hub.
     options:
-      ah_groups:
+      aap_teams:
         default: []
         required: false
         description: Data structure describing your groups to manage.
diff --git a/roles/hub_group/tasks/main.yml b/roles/hub_group/tasks/main.yml
index b5a984ed9..3023a32c3 100644
--- a/roles/hub_group/tasks/main.yml
+++ b/roles/hub_group/tasks/main.yml
@@ -12,7 +12,7 @@
     ah_path_prefix:   "{{ ah_path_prefix | default(omit) }}"
     validate_certs:   "{{ aap_validate_certs | default(omit) }}"
     request_timeout:  "{{ aap_request_timeout | default(omit) }}"
-  loop: "{{ ah_groups }}"
+  loop: "{{ aap_teams }}"
   loop_control:
     loop_var: "__group"
     label: "{{ __operation.verb }} the label {{ __ah_configuration_group__item.name }} to Controller"