diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
index b7508749c8..4bb140289a 100644
--- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
+++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
@@ -553,6 +553,41 @@ data:
     - helm-toolkit
 ---
 schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-nova-api-proxy
+data:
+  chart_name: nova-api-proxy
+  release: openstack-nova-api-proxy
+  namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-nova-api-proxy
+  test:
+    enabled: false
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+    pre:
+      delete:
+        - type: job
+          labels:
+            release_group: osh-openstack-nova-api-proxy
+        - type: pod
+          labels:
+            release_group: osh-openstack-nova-api-proxy
+            component: test
+  source:
+    type: tar
+    location: http://172.17.0.1/helm_charts/nova-api-proxy-0.1.0.tgz
+    subpath: nova-api-proxy
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-neutron
@@ -2360,6 +2395,7 @@ data:
   chart_group:
     - openstack-libvirt
     - openstack-nova
+    - openstack-nova-api-proxy
     - openstack-neutron
 ---
 schema: armada/ChartGroup/v1
diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
index 9e580dde3e..0e9fad350a 100644
--- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
+++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
@@ -553,6 +553,41 @@ data:
     - helm-toolkit
 ---
 schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: openstack-nova-api-proxy
+data:
+  chart_name: nova-api-proxy
+  release: openstack-nova-api-proxy
+  namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-nova-api-proxy
+  test:
+    enabled: false
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+    pre:
+      delete:
+        - type: job
+          labels:
+            release_group: osh-openstack-nova-api-proxy
+        - type: pod
+          labels:
+            release_group: osh-openstack-nova-api-proxy
+            component: test
+  source:
+    type: tar
+    location: http://172.17.0.1/helm_charts/nova-api-proxy-0.1.0.tgz
+    subpath: nova-api-proxy
+    reference: master
+  dependencies:
+    - helm-toolkit
+---
+schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: openstack-neutron
@@ -2358,6 +2393,7 @@ data:
   chart_group:
     - openstack-libvirt
     - openstack-nova
+    - openstack-nova-api-proxy
     - openstack-neutron
 ---
 schema: armada/ChartGroup/v1
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py b/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
index c95dc028de..704aa91c3f 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
@@ -57,23 +57,10 @@ class NovaApiProxyHelm(openstack.OpenstackBaseHelm):
         else:
             return overrides
 
-    def _get_endpoints_identity_users_overrides(self):
-        overrides = {}
-        overrides.update(self._get_common_users_overrides(self.SERVICE_NAME))
-
-        for user in self.AUTH_USERS:
-            overrides.update({
-                user: {
-                    'region_name': self._region_name(),
-                    'password': self._get_keyring_password(self.SERVICE_NAME, user)
-                }
-            })
-        return overrides
-
-    def _get_endpoints_identity_overrides(self):
-        return {'auth': self._get_endpoints_identity_users_overrides()}
-
     def _get_endpoints_overrides(self):
         return {
-            'identity': self._get_endpoints_identity_overrides(),
+            'identity': {
+                'auth': self._get_endpoints_identity_overrides(
+                    self.SERVICE_NAME, self.AUTH_USERS),
+            }
         }