diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index 4d87e54704..770e8246d9 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -130,8 +130,10 @@ outputs:
             cinder::keystone::authtoken::project_name: 'service'
             cinder::keystone::authtoken::user_domain_name: 'Default'
             cinder::keystone::authtoken::project_domain_name: 'Default'
+            cinder::keystone::authtoken::region_name: {get_param: KeystoneRegion}
             cinder::policy::policies: {get_param: CinderApiPolicies}
             cinder::ceilometer::notification_driver: {get_param: NotificationDriver}
+            cinder::api::os_region_name: {get_param: KeystoneRegion}
             cinder::api::default_volume_type: {get_param: CinderDefaultVolumeType}
             cinder::api::enable_proxy_headers_parsing: true
 
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index eeb79c66ad..cb5c57afc3 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -330,6 +330,7 @@ outputs:
                   - 9292
                   - 13292
             glance::api::authtoken::project_name: 'service'
+            glance::api::authtoken::region_name: {get_param: KeystoneRegion}
             glance::keystone::authtoken::user_domain_name: 'Default'
             glance::keystone::authtoken::project_domain_name: 'Default'
             glance::api::pipeline:
diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml
index 7007a613c6..325aa0e395 100644
--- a/deployment/heat/heat-base-puppet.yaml
+++ b/deployment/heat/heat-base-puppet.yaml
@@ -28,6 +28,10 @@ parameters:
     description: The password for the Heat service and db account, used by the Heat services.
     type: string
     hidden: true
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
   DefaultPasswords:
     default: {}
     type: json
@@ -181,6 +185,7 @@ outputs:
             heat::enable_proxy_headers_parsing: true
             heat::rpc_response_timeout: 600
             heat::rabbit_heartbeat_timeout_threshold: 60
+            heat::region_name: {get_param: KeystoneRegion}
             heat::keystone::authtoken::project_name: 'service'
             heat::keystone::authtoken::user_domain_name: 'Default'
             heat::keystone::authtoken::project_domain_name: 'Default'
@@ -188,6 +193,7 @@ outputs:
             heat::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             heat::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             heat::keystone::authtoken::password: {get_param: HeatPassword}
+            heat::keystone::authtoken::region_name: {get_param: KeystoneRegion}
             heat::heat_keystone_clients_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix] }
             heat::keystone::domain::domain_name: 'heat_stack'
             heat::keystone::domain::domain_admin: 'heat_stack_domain_admin'
diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml
index c6f0d12c95..ed19024a67 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -213,8 +213,11 @@ outputs:
             neutron::keystone::authtoken::project_name: 'service'
             neutron::keystone::authtoken::user_domain_name: 'Default'
             neutron::keystone::authtoken::project_domain_name: 'Default'
+            neutron::keystone::authtoken::region_name: {get_param: KeystoneRegion}
             neutron::quota::quota_port: {get_param: NeutronPortQuota}
             neutron::server::sync_db: true
+            neutron::server::notifications::region_name: {get_param: KeystoneRegion}
+            neutron::server::placement::region_name: {get_param: KeystoneRegion}
             tripleo::neutron_api::firewall_rules:
               '114 neutron api':
                 dport:
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index c5fe0855f8..f6840ac7c0 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -196,6 +196,7 @@ outputs:
             nova::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
+            nova::keystone::authtoken::region_name: {get_param: KeystoneRegion}
             nova::api::enabled: true
             nova::api::default_floating_pool: {get_param: NovaDefaultFloatingPool}
             nova::api::sync_db_api: true
diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
index b40b946049..85d83a565d 100644
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@@ -280,6 +280,7 @@ outputs:
           nova::placement::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
           nova::placement::region_name: {get_param: KeystoneRegion}
           nova::placement::valid_interfaces: {get_param: PlacementAPIInterface}
+          nova::os_region_name: {get_param: KeystoneRegion}
           nova::database_connection:
             make_url:
               scheme: {get_param: [EndpointMap, MysqlCellInternal, protocol]}
diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml
index 51ce4ee43c..6f8c85d1f8 100644
--- a/deployment/nova/nova-metadata-container-puppet.yaml
+++ b/deployment/nova/nova-metadata-container-puppet.yaml
@@ -141,6 +141,7 @@ outputs:
             nova::keystone::authtoken::password: {get_param: NovaPassword}
             nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+            nova::keystone::authtoken::region_name: {get_param: KeystoneRegion}
             nova::metadata::enable_proxy_headers_parsing: true
             nova_metadata_wsgi_enabled: true
             nova::wsgi::apache_metadata::api_port: '8775'