diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml
index c039505766..8d83062428 100644
--- a/deployment/aodh/aodh-api-container-puppet.yaml
+++ b/deployment/aodh/aodh-api-container-puppet.yaml
@@ -166,6 +166,14 @@ outputs:
             aodh::api::service_name: 'httpd'
             aodh::api::enable_proxy_headers_parsing: true
             aodh::api::gnocchi_external_project_owner: {get_param: GnocchiExternalProject}
+            aodh::keystone::authtoken::project_name: 'service'
+            aodh::keystone::authtoken::user_domain_name: 'Default'
+            aodh::keystone::authtoken::project_domain_name: 'Default'
+            aodh::keystone::authtoken::password: {get_param: AodhPassword}
+            aodh::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
+            aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
+            aodh::keystone::authtoken::region_name: {get_param: KeystoneRegion}
+            aodh::keystone::authtoken::interface: 'internal'
             aodh::policy::policies: {get_param: AodhApiPolicies}
             # NOTE: bind IP is found in hiera replacing the network name with the
             # local node IP for the given network; replacement examples
diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml
index 02b5539839..01996bcfad 100644
--- a/deployment/aodh/aodh-base.yaml
+++ b/deployment/aodh/aodh-base.yaml
@@ -89,14 +89,6 @@ outputs:
           - {get_param: Debug}
         aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
         aodh::notification_driver: {get_param: NotificationDriver}
-        aodh::keystone::authtoken::project_name: 'service'
-        aodh::keystone::authtoken::user_domain_name: 'Default'
-        aodh::keystone::authtoken::project_domain_name: 'Default'
-        aodh::keystone::authtoken::password: {get_param: AodhPassword}
-        aodh::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
-        aodh::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
-        aodh::keystone::authtoken::region_name: {get_param: KeystoneRegion}
-        aodh::keystone::authtoken::interface: 'internal'
         aodh::auth::auth_password: {get_param: AodhPassword}
         aodh::auth::auth_region: {get_param: KeystoneRegion}
         aodh::auth::auth_project_name: 'service'