diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index da3c4bec8..307ce68cb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,9 +1,41 @@
-============================================
+======================================
 infra.aap_configuration Release Notes
-============================================
+======================================
 
 .. contents:: Topics
 
+v3.0.0
+======
+
+Release Summary
+---------------
+
+| Release Date: 2024-10-31
+| The collection has been updated for AAP 2.5 use and has only been tested against AAP 2.5, it has been updated to include the previously separated hub, eda, and gateway collection roles.
+| `Conversion Guide <https://github.com/redhat-cop/infra.aap_configuration/blob/devel/CONVERSION_GUIDE.md>`__
+
+Major Changes
+-------------
+
+- Introduction of roles for gateway
+- Rename of collection to infra.aap_configuration
+- Roles from infra.ah_configuration and infra.eda_configuration have migrated into this collection
+
+Breaking Changes / Porting Guide
+--------------------------------
+
+- Major overhaul to all code completed, variables have changed, role names have changed, please see the Conversion guide for more details.
+
+Removed Features (previously deprecated)
+----------------------------------------
+
+- ee_namespace role has been removed, this was removed in AAP 2.4, and was depreciated then.
+
+Bugfixes
+--------
+
+- Controller credentials role now includes request timeout option.
+- meta_dependency_check set to default to false. This is due to feature not working on controller, or in offline environments without a hub. Set controller_dependency_check to 'true' to re-enable feature.
 
 v2.11.0
 =======
diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
index fea5c0ac6..fb3ef1d31 100644
--- a/changelogs/.plugin-cache.yaml
+++ b/changelogs/.plugin-cache.yaml
@@ -1,154 +1,309 @@
 objects:
   role:
-    ad_hoc_command:
+    ansible_config:
+      description: An Ansible Role to create ansible.cfg files based on your Automation
+        Hub servers
+      name: ansible_config
+      version_added: null
+    controller_ad_hoc_command:
       description: An Ansible Role to run a list of ad hoc commands on Ansible Controller.
-      name: ad_hoc_command
+      name: controller_ad_hoc_command
       version_added: null
-    ad_hoc_command_cancel:
+    controller_ad_hoc_command_cancel:
       description: An Ansible Role to cancel a list of ad hoc commands on Ansible
         Controller.
-      name: ad_hoc_command_cancel
+      name: controller_ad_hoc_command_cancel
       version_added: null
-    applications:
+    controller_applications:
       description: An Ansible Role to create Applications on Ansible Controller.
-      name: applications
+      name: controller_applications
       version_added: null
-    bulk_host_create:
+    controller_bulk_host_create:
       description: An Ansible Role to run a list of ad hoc commands on Ansible Controller.
-      name: bulk_host_create
+      name: controller_bulk_host_create
       version_added: null
-    bulk_job_launch:
+    controller_bulk_job_launch:
       description: An Ansible Role to run a list of ad hoc commands on Ansible Controller.
-      name: bulk_job_launch
+      name: controller_bulk_job_launch
       version_added: null
-    credential_input_sources:
+    controller_credential_input_sources:
       description: An Ansible Role to create Credential Input Sources on Ansible Controller.
-      name: credential_input_sources
+      name: controller_credential_input_sources
       version_added: null
-    credential_types:
+    controller_credential_types:
       description: An Ansible Role to create credential types on Ansible Controller.
-      name: credential_types
+      name: controller_credential_types
       version_added: null
-    credentials:
+    controller_credentials:
       description: An Ansible Role to create credentials on Ansible Controller.
-      name: credentials
-      version_added: null
-    dispatch:
-      description: An Ansible Role to call other roles to create objects on Ansible
-        Controller.
-      name: dispatch
+      name: controller_credentials
       version_added: null
-    execution_environments:
+    controller_execution_environments:
       description: An Ansible Role to create execution environment objects on Ansible
         Controller.
-      name: execution_environments
-      version_added: null
-    filetree_create:
-      description: An Ansible Role to create a local file tree of objects existing
-        in Controller
-      name: filetree_create
-      version_added: null
-    filetree_read:
-      description: An Ansible Role to read from a local file tree and create objects
-        in Controller
-      name: filetree_read
+      name: controller_execution_environments
       version_added: null
-    groups:
+    controller_host_groups:
       description: An Ansible Role to create groups on Ansible Controller.
-      name: groups
+      name: controller_host_groups
       version_added: null
-    hosts:
+    controller_hosts:
       description: An Ansible Role to create hosts on Ansible Controller.
-      name: hosts
+      name: controller_hosts
       version_added: null
-    instance_groups:
+    controller_instance_groups:
       description: An Ansible Role to create instance groups on Ansible Controller.
-      name: instance_groups
+      name: controller_instance_groups
       version_added: null
-    instances:
+    controller_instances:
       description: An Ansible Role to create instances on Ansible Controller.
-      name: instances
+      name: controller_instances
       version_added: null
-    inventories:
+    controller_inventories:
       description: An Ansible Role to create inventories on Ansible Controller.
-      name: inventories
+      name: controller_inventories
       version_added: null
-    inventory_source_update:
+    controller_inventory_source_update:
       description: An Ansible Role to update inventory sources on Ansible Controller.
-      name: inventory_source_update
+      name: controller_inventory_source_update
       version_added: null
-    inventory_sources:
+    controller_inventory_sources:
       description: An Ansible Role to create inventory sources on Ansible Controller.
-      name: inventory_sources
+      name: controller_inventory_sources
       version_added: null
-    job_launch:
+    controller_job_launch:
       description: An Ansible Role to launch jobs on Ansible Controller.
-      name: job_launch
+      name: controller_job_launch
       version_added: null
-    job_templates:
+    controller_job_templates:
       description: An Ansible Role to create job templates on Ansible Controller.
-      name: job_templates
+      name: controller_job_templates
       version_added: null
-    jobs_cancel:
+    controller_jobs_cancel:
       description: An Ansible Role to cancel a list of jobs on Ansible Controller.
-      name: jobs_cancel
+      name: controller_jobs_cancel
       version_added: null
-    labels:
+    controller_labels:
       description: An Ansible Role to create labels on Ansible Controller.
-      name: labels
+      name: controller_labels
       version_added: null
-    license:
+    controller_license:
       description: An Ansible Role to deploy a license on Ansible Controller.
-      name: license
+      name: controller_license
       version_added: null
-    notification_templates:
+    controller_notification_templates:
       description: An Ansible Role to create notification templates on Ansible Controller.
-      name: notification_templates
+      name: controller_notification_templates
       version_added: null
-    object_diff:
-      description: An Ansible Role to read from a local file tree and create objects
-        in Controller
-      name: object_diff
-      version_added: null
-    organizations:
+    controller_organizations:
       description: An Ansible Role to create organizations on Ansible Controller.
-      name: organizations
+      name: controller_organizations
       version_added: null
-    project_update:
+    controller_project_update:
       description: An Ansible Role to update projects on Ansible Controller.
-      name: project_update
+      name: controller_project_update
       version_added: null
-    projects:
+    controller_projects:
       description: An Ansible Role to create projects on Ansible Controller.
-      name: projects
+      name: controller_projects
       version_added: null
-    roles:
+    controller_roles:
       description: An Ansible Role to create roles on Ansible Controller.
-      name: roles
+      name: controller_roles
       version_added: null
-    schedules:
+    controller_schedules:
       description: An Ansible Role to create schedules on Ansible Controller.
-      name: schedules
+      name: controller_schedules
       version_added: null
-    settings:
+    controller_settings:
       description: An Ansible Role to create settings on Ansible Controller.
-      name: settings
+      name: controller_settings
       version_added: null
-    teams:
+    controller_teams:
       description: An Ansible Role to create teams on Ansible Controller.
-      name: teams
+      name: controller_teams
       version_added: null
-    users:
+    controller_users:
       description: An Ansible Role to create users on Ansible Controller.
-      name: users
+      name: controller_users
       version_added: null
-    workflow_job_templates:
+    controller_workflow_job_templates:
       description: An Ansible Role to create workflow job templates on Ansible Controller.
-      name: workflow_job_templates
+      name: controller_workflow_job_templates
       version_added: null
-    workflow_launch:
+    controller_workflow_launch:
       description: An Ansible Role to launch workflows on Ansible Controller.
-      name: workflow_launch
+      name: controller_workflow_launch
+      version_added: null
+    dispatch:
+      description: An Ansible Role to call other roles to create objects on Ansible
+        Automation Platform.
+      name: dispatch
+      version_added: null
+    eda_controller_tokens:
+      description: An Ansible Role to create user tokens in EDA controller.
+      name: eda_controller_tokens
+      version_added: null
+    eda_credential_types:
+      description: An Ansible Role to create credentials in EDA controller.
+      name: eda_credential_types
+      version_added: null
+    eda_credentials:
+      description: An Ansible Role to create credentials in EDA controller.
+      name: eda_credentials
+      version_added: null
+    eda_decision_environments:
+      description: An Ansible Role to create decision environments in EDA controller.
+      name: eda_decision_environments
+      version_added: null
+    eda_event_streams:
+      description: An Ansible Role to create event streams in EDA controller.
+      name: eda_event_streams
+      version_added: null
+    eda_projects:
+      description: An Ansible Role to create projects in EDA controller.
+      name: eda_projects
+      version_added: null
+    eda_rulebook_activations:
+      description: An Ansible Role to create rulebook activations in EDA controller.
+      name: eda_rulebook_activations
+      version_added: null
+    eda_users:
+      description: An Ansible Role to create users in EDA controller.
+      name: eda_users
+      version_added: null
+    gateway_applications:
+      description: An Ansible Role to create Applications on Ansible gateway.
+      name: gateway_applications
+      version_added: null
+    gateway_authenticator_maps:
+      description: An Ansible Role to create authenticator maps on automation platform
+        gateway.
+      name: gateway_authenticator_maps
+      version_added: null
+    gateway_authenticators:
+      description: An Ansible Role to create authenticators on automation platform
+        gateway.
+      name: gateway_authenticators
+      version_added: null
+    gateway_http_ports:
+      description: An Ansible Role to create http ports on automation platform gateway.
+      name: gateway_http_ports
+      version_added: null
+    gateway_organizations:
+      description: An Ansible Role to create organizations on automation platform
+        gateway.
+      name: gateway_organizations
+      version_added: null
+    gateway_role_user_assignments:
+      description: An Ansible Role to create role user assignment on automation platform
+        gateway.
+      name: gateway_role_user_assignments
+      version_added: null
+    gateway_routes:
+      description: An Ansible Role to create service nodes on automation platform
+        gateway.
+      name: gateway_routes
+      version_added: null
+    gateway_service_clusters:
+      description: An Ansible Role to create service clusters on automation platform
+        gateway.
+      name: gateway_service_clusters
+      version_added: null
+    gateway_service_keys:
+      description: An Ansible Role to create service keys on automation platform gateway.
+      name: gateway_service_keys
+      version_added: null
+    gateway_service_nodes:
+      description: An Ansible Role to create service nodes on automation platform
+        gateway.
+      name: gateway_service_nodes
+      version_added: null
+    gateway_services:
+      description: An Ansible Role to create services on automation platform gateway.
+      name: gateway_services
+      version_added: null
+    gateway_settings:
+      description: An Ansible Role to create settings on automation platform gateway.
+      name: gateway_settings
+      version_added: null
+    gateway_teams:
+      description: An Ansible Role to create teams on automation platform gateway.
+      name: gateway_teams
+      version_added: null
+    gateway_users:
+      description: An Ansible Role to create users on automation platform gateway.
+      name: gateway_users
+      version_added: null
+    hub_collection:
+      description: An Ansible Role to update, or destroy Automation Hub Collections.
+      name: hub_collection
+      version_added: null
+    hub_collection_remote:
+      description: An Ansible Role to create collection remotes in Automation Hub.
+      name: hub_collection_remote
+      version_added: null
+    hub_collection_repository:
+      description: An Ansible Role to create collection remotes in Automation Hub.
+      name: hub_collection_repository
+      version_added: null
+    hub_collection_repository_sync:
+      description: An Ansible Role to create collection remotes in Automation Hub.
+      name: hub_collection_repository_sync
+      version_added: null
+    hub_ee_image:
+      description: An Ansible Role to create execution environment images in Automation
+        Hub.
+      name: hub_ee_image
+      version_added: null
+    hub_ee_registry:
+      description: An Ansible Role to create execution environment registry in Automation
+        Hub.
+      name: hub_ee_registry
+      version_added: null
+    hub_ee_registry_index:
+      description: An Ansible Role to index execution environment registries in Automation
+        Hub.
+      name: hub_ee_registry_index
+      version_added: null
+    hub_ee_registry_sync:
+      description: An Ansible Role to sync execution environment registries in Automation
+        Hub.
+      name: hub_ee_registry_sync
+      version_added: null
+    hub_ee_repository:
+      description: An Ansible Role to create execution environment repositories in
+        Automation Hub.
+      name: hub_ee_repository
+      version_added: null
+    hub_ee_repository_sync:
+      description: An Ansible Role to sync execution environment repositories in Automation
+        Hub.
+      name: hub_ee_repository_sync
+      version_added: null
+    hub_group:
+      description: An Ansible Role to create groups in Automation Hub.
+      name: hub_group
+      version_added: null
+    hub_group_roles:
+      description: An Ansible Role to create groups roles in Automation Hub.
+      name: hub_group_roles
+      version_added: null
+    hub_namespace:
+      description: An Ansible Role to create namespaces in Automation Hub.
+      name: hub_namespace
+      version_added: null
+    hub_publish:
+      description: An Ansible Role to publish collections in Automation Hub.
+      name: hub_publish
+      version_added: null
+    hub_role:
+      description: An Ansible Role to create role permissions in Automation Hub.
+      name: hub_role
+      version_added: null
+    hub_user:
+      description: An Ansible Role to create users in Automation Hub.
+      name: hub_user
       version_added: null
 plugins:
   become: {}
@@ -159,21 +314,11 @@ plugins:
   filter: {}
   httpapi: {}
   inventory: {}
-  lookup:
-    controller_object_diff:
-      description: Return difference for objects from Controller API
-      name: controller_object_diff
-      version_added: null
-  module:
-    controller_export_diff:
-      description: Compare controller configuration resources with those defined in
-        code.
-      name: controller_export_diff
-      namespace: ''
-      version_added: null
+  lookup: {}
+  module: {}
   netconf: {}
   shell: {}
   strategy: {}
   test: {}
   vars: {}
-version: 2.11.0
+version: 3.0.0
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 81c176f7a..50050188d 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -729,3 +729,34 @@ releases:
     - pause_loop.yml
     - var_spaces.yml
     release_date: '2024-09-23'
+  3.0.0:
+    changes:
+      breaking_changes:
+      - Major overhaul to all code completed, variables have changed, role names have
+        changed, please see the Conversion guide for more details.
+      bugfixes:
+      - Controller credentials role now includes request timeout option.
+      - meta_dependency_check set to default to false. This is due to feature not
+        working on controller, or in offline environments without a hub. Set controller_dependency_check
+        to 'true' to re-enable feature.
+      major_changes:
+      - Introduction of roles for gateway
+      - Rename of collection to infra.aap_configuration
+      - Roles from infra.ah_configuration and infra.eda_configuration have migrated
+        into this collection
+      release_summary: '| Release Date: 2024-10-31
+
+        | The collection has been updated for AAP 2.5 use and has only been tested
+        against AAP 2.5, it has been updated to include the previously separated hub,
+        eda, and gateway collection roles.
+
+        | `Conversion Guide <https://github.com/redhat-cop/infra.aap_configuration/blob/devel/CONVERSION_GUIDE.md>`__
+
+        '
+      removed_features:
+      - ee_namespace role has been removed, this was removed in AAP 2.4, and was depreciated
+        then.
+    fragments:
+    - Rewrite.yml
+    - ee_namespace_removed.yml
+    release_date: '2024-11-08'
diff --git a/changelogs/fragments/Rewrite.yml b/changelogs/fragments/Rewrite.yml
deleted file mode 100644
index 8afaf451f..000000000
--- a/changelogs/fragments/Rewrite.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-release_summary: |
-   | Release Date: 2024-10-31
-   | The collection has been updated for AAP 2.5 use and has only been tested against AAP 2.5, it has been updated to include the previously separated hub, eda, and gateway collection roles.
-   | `Conversion Guide <https://github.com/redhat-cop/infra.aap_configuration/blob/devel/CONVERSION_GUIDE.md>`__
-breaking_changes:
-  - Major overhaul to all code completed, variables have changed, role names have changed, please see the Conversion guide for more details.
-major_changes:
-  - Roles from infra.ah_configuration and infra.eda_configuration have migrated into this collection
-  - Rename of collection to infra.aap_configuration
-  - Introduction of roles for gateway
-bugfixes:
-  - Controller credentials role now includes request timeout option.
-  - meta_dependency_check set to default to false. This is due to feature not working on controller, or in offline environments without a hub. Set controller_dependency_check to 'true' to re-enable feature.
diff --git a/changelogs/fragments/ee_namespace_removed.yml b/changelogs/fragments/ee_namespace_removed.yml
deleted file mode 100644
index c1a153801..000000000
--- a/changelogs/fragments/ee_namespace_removed.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-removed_features:
-  - ee_namespace role has been removed, this was removed in AAP 2.4, and was depreciated then.
diff --git a/changelogs/fragments/hub_vars.yml b/changelogs/fragments/hub_vars.yml
index 55ea27422..ca42162b4 100644
--- a/changelogs/fragments/hub_vars.yml
+++ b/changelogs/fragments/hub_vars.yml
@@ -1,6 +1,6 @@
 ---
 major_changes:
   - renamed some more vars that got missed in the new naming convention.
-bug_fixes:
+bugfixes:
   - updated gateway services async and no log vars to correct naming convention.
 ...