diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml
index 9989722c32..307c07532a 100644
--- a/neutron/templates/configmap-etc.yaml
+++ b/neutron/templates/configmap-etc.yaml
@@ -65,6 +65,25 @@ limitations under the License.
 {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.neutron.nova "auth_url" | quote | trunc 0 -}}
 {{- end }}
 
+{{- if empty .Values.conf.neutron.nova.region_name -}}
+{{- set .Values.conf.neutron.nova "region_name" .Values.endpoints.identity.auth.nova.region_name | quote | trunc 0 -}}
+{{- end -}}
+{{- if empty .Values.conf.neutron.nova.project_name -}}
+{{- set .Values.conf.neutron.nova "project_name" .Values.endpoints.identity.auth.nova.project_name | quote | trunc 0 -}}
+{{- end -}}
+{{- if empty .Values.conf.neutron.nova.project_domain_name -}}
+{{- set .Values.conf.neutron.nova "project_domain_name" .Values.endpoints.identity.auth.nova.project_domain_name | quote | trunc 0 -}}
+{{- end -}}
+{{- if empty .Values.conf.neutron.nova.user_domain_name -}}
+{{- set .Values.conf.neutron.nova "user_domain_name" .Values.endpoints.identity.auth.nova.user_domain_name | quote | trunc 0 -}}
+{{- end -}}
+{{- if empty .Values.conf.neutron.nova.username -}}
+{{- set .Values.conf.neutron.nova "username" .Values.endpoints.identity.auth.nova.username | quote | trunc 0 -}}
+{{- end -}}
+{{- if empty .Values.conf.neutron.nova.password -}}
+{{- set .Values.conf.neutron.nova "password" .Values.endpoints.identity.auth.nova.password | quote | trunc 0 -}}
+{{- end -}}
+
 {{- if empty .Values.conf.metadata_agent.cache.memcache_servers -}}
 {{- tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.metadata_agent.cache "memcache_servers" | quote | trunc 0 -}}
 {{- end -}}
diff --git a/neutron/values.yaml b/neutron/values.yaml
index c519a01d53..0d988f7d9e 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -663,12 +663,6 @@ conf:
     nova:
       auth_type: password
       auth_version: v3
-      region_name: RegionOne
-      project_domain_name: default
-      project_name: service
-      user_domain_name: default
-      username: nova
-      password: password
     keystone_authtoken:
       memcache_security_strategy: ENCRYPT
       auth_type: password
@@ -838,6 +832,13 @@ endpoints:
         project_name: service
         user_domain_name: default
         project_domain_name: default
+      nova:
+        region_name: RegionOne
+        project_domain_name: default
+        project_name: service
+        user_domain_name: default
+        username: nova
+        password: password
     hosts:
       default: keystone-api
       public: keystone