diff --git a/nova/templates/bin/_post.sh.tpl b/nova/templates/bin/_post.sh.tpl
index e20aaf8bb2..ebb4515cf6 100644
--- a/nova/templates/bin/_post.sh.tpl
+++ b/nova/templates/bin/_post.sh.tpl
@@ -21,7 +21,7 @@ ansible localhost -vvv -m kolla_keystone_service -a "service_name=nova \
 service_type=compute \
 description='Openstack Compute' \
 endpoint_region={{ .Values.keystone.nova_region_name }} \
-url='{{ include "helm-toolkit.endpoint_nova_api_internal" . }}' \
+url='{{ tuple "compute" "admin" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}' \
 interface=admin \
 region_name={{ .Values.keystone.admin_region_name }} \
 auth='{{ include "helm-toolkit.keystone_auth" .}}'" \
@@ -31,7 +31,7 @@ ansible localhost -vvv -m kolla_keystone_service -a "service_name=nova \
 service_type=compute \
 description='Openstack Compute' \
 endpoint_region={{ .Values.keystone.nova_region_name }} \
-url='{{ include "helm-toolkit.endpoint_nova_api_internal" . }}' \
+url='{{ tuple "compute" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}' \
 interface=internal \
 region_name={{ .Values.keystone.admin_region_name }} \
 auth='{{ include "helm-toolkit.keystone_auth" .}}'" \
@@ -41,7 +41,7 @@ ansible localhost -vvv -m kolla_keystone_service -a "service_name=nova \
 service_type=compute \
 description='Openstack Compute' \
 endpoint_region={{ .Values.keystone.nova_region_name }} \
-url='{{ include "helm-toolkit.endpoint_nova_api_internal" . }}' \
+url='{{ tuple "compute" "public" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}' \
 interface=public \
 region_name={{ .Values.keystone.admin_region_name }} \
 auth='{{ include "helm-toolkit.keystone_auth" .}}'" \
@@ -68,5 +68,4 @@ export OS_INSECURE=1
 EOF
 
 . /tmp/openrc
-env
-openstack --debug role create _member_ --or-show
+openstack --debug role create --or-show _member_
diff --git a/nova/templates/etc/_nova.conf.tpl b/nova/templates/etc/_nova.conf.tpl
index 845a39db3e..68c4dcf834 100644
--- a/nova/templates/etc/_nova.conf.tpl
+++ b/nova/templates/etc/_nova.conf.tpl
@@ -57,23 +57,26 @@ lock_path = /var/lib/nova/tmp
 workers = {{ .Values.nova.default.conductor_workers }}
 
 [glance]
-api_servers = {{ include "helm-toolkit.endpoint_glance_api_internal" . }}
+api_servers = {{ tuple "image" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}
 num_retries = 3
 
 [cinder]
 catalog_info = volume:cinder:internalURL
 
 [neutron]
-url = {{ include "helm-toolkit.endpoint_neutron_api_internal" . }}
+url = {{ tuple "network" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}
 
 metadata_proxy_shared_secret = {{ .Values.neutron.metadata_secret }}
 service_metadata_proxy = True
 
-auth_url = {{ include "helm-toolkit.endpoint_keystone_admin" . }}
+memcached_servers = "{{ .Values.memcached.host }}:{{ .Values.memcached.port }}"
+auth_version = v3
+auth_url = {{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}
 auth_type = password
-project_domain_name = default
-user_domain_id = default
-project_name = service
+region_name = {{ .Values.keystone.neutron_region_name }}
+project_domain_name = {{ .Values.keystone.neutron_project_domain }}
+project_name = {{ .Values.keystone.neutron_project_name }}
+user_domain_name = {{ .Values.keystone.neutron_user_domain }}
 username = {{ .Values.keystone.neutron_user }}
 password = {{ .Values.keystone.neutron_password }}
 
@@ -86,12 +89,14 @@ connection = mysql+pymysql://{{ .Values.database.nova_user }}:{{ .Values.databas
 max_retries = -1
 
 [keystone_authtoken]
-auth_uri = {{ include "helm-toolkit.endpoint_keystone_internal" . }}
-auth_url = {{ include "helm-toolkit.endpoint_keystone_admin" . }}
+memcached_servers = "{{ .Values.memcached.host }}:{{ .Values.memcached.port }}"
+auth_version = v3
+auth_url = {{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}
 auth_type = password
-project_domain_id = default
-user_domain_id = default
-project_name = service
+region_name = {{ .Values.keystone.nova_region_name }}
+project_domain_name = {{ .Values.keystone.nova_project_domain }}
+project_name = {{ .Values.keystone.nova_project_name }}
+user_domain_name = {{ .Values.keystone.nova_user_domain }}
 username = {{ .Values.keystone.nova_user }}
 password = {{ .Values.keystone.nova_password }}
 
@@ -116,7 +121,7 @@ compute = auto
 [cache]
 enabled = True
 backend = oslo_cache.memcache_pool
-memcache_servers = {{ .Values.memcached.address }}
+memcache_servers = "{{ .Values.memcached.host }}:{{ .Values.memcached.port }}"
 
 [wsgi]
 api_paste_config = /etc/nova/api-paste.ini
diff --git a/nova/values.yaml b/nova/values.yaml
index 981f114f8c..4a605862c3 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -86,18 +86,26 @@ database:
 
 keystone:
   admin_user: "admin"
+  admin_user_domain: "default"
   admin_password: "password"
   admin_project_name: "admin"
+  admin_project_domain: "default"
   admin_region_name: "RegionOne"
-  domain_name: "default"
-  tenant_name: "admin"
 
   neutron_user: "neutron"
+  neutron_user_domain: "default"
+  neutron_user_role: "admin"
   neutron_password: "password"
+  neutron_project_name: "service"
+  neutron_project_domain: "default"
   neutron_region_name: "RegionOne"
 
   nova_user: "nova"
+  nova_user_domain: "default"
+  nova_user_role: "admin"
   nova_password: "password"
+  nova_project_name: "service"
+  nova_project_domain: "default"
   nova_region_name: "RegionOne"
 
 rabbitmq:
@@ -118,7 +126,8 @@ neutron:
   metadata_secret: "password"
 
 memcached:
-  address: "memcached:11211"
+  host: memcached
+  port: 11211
 
 dependencies:
   api:
@@ -195,39 +204,39 @@ dependencies:
 # values, but should include all endpoints
 # required by this chart
 endpoints:
-  glance:
-    hosts:
-      default: glance-api
-    type: image
-    path: null
-    scheme: 'http'
-    port:
-      api: 9292
-      registry: 9191
-  nova:
+  compute:
+    name: nova
     hosts:
       default: nova-api
     path: "/v2/%(tenant_id)s"
-    type: compute
     scheme: 'http'
     port:
       api: 8774
       metadata: 8775
       novncproxy: 6080
-  keystone:
+  identity:
+    name: keystone
     hosts:
       default: keystone-api
     path: /v3
-    type: identity
     scheme: 'http'
     port:
-        admin: 35357
-        public: 5000
-  neutron:
+      api: 5000
+      admin: 35357
+  image:
+    name: glance
+    hosts:
+      default: glance-api
+    path: null
+    scheme: 'http'
+    port:
+      api: 9292
+      registry: 9191
+  network:
+    name: neutron
     hosts:
       default: neutron-server
     path: null
-    type: network
     scheme: 'http'
     port:
       api: 9696