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 df517d436b..31c72f1ad3 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
@@ -3016,52 +3016,6 @@ data:
   dependencies:
     - helm-toolkit
 ---
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: openstack-clients
-data:
-  chart_name: clients
-  release: openstack-clients
-  namespace: openstack
-  wait:
-    timeout: 600
-    labels:
-      app: openstack-clients
-  install:
-    no_hooks: false
-  upgrade:
-    no_hooks: false
-    pre:
-      delete:
-        - type: job
-          labels:
-            app: openstack-clients
-  values:
-    endpoints:
-      identity:
-        name: keystone
-        namespace: openstack
-    labels:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
-    global:
-      cloud_name: openstack_helm
-      replicas: 1
-      keep_running: true
-    volume:
-      size: 20Gi
-    images:
-      tags:
-        openstackclients: docker.io/starlingx/stx-openstackclients:master-centos-stable-latest
-  source:
-    type: tar
-    location: http://172.17.0.1/helm_charts/starlingx/clients-0.1.0.tgz
-    subpath: clients
-    reference: master
-  dependencies:
-    - helm-toolkit
----
 schema: armada/ChartGroup/v1
 metadata:
   schema: metadata/Document/v1
@@ -3219,16 +3173,6 @@ data:
     - openstack-panko
     - openstack-ceilometer
 ---
-schema: armada/ChartGroup/v1
-metadata:
-  schema: metadata/Document/v1
-  name: openstack-clients
-data:
-  description: "Deploy clients"
-  sequenced: false
-  chart_group:
-    - openstack-clients
----
 schema: armada/Manifest/v1
 metadata:
   schema: metadata/Document/v1
@@ -3242,7 +3186,6 @@ data:
     - openstack-memcached
     - openstack-rabbitmq
     - openstack-keystone
-    - openstack-clients
     - openstack-barbican
     - openstack-glance
     - openstack-cinder
diff --git a/sysinv/sysinv/sysinv/setup.cfg b/sysinv/sysinv/sysinv/setup.cfg
index 20f5d34e50..f175a2bcc7 100644
--- a/sysinv/sysinv/sysinv/setup.cfg
+++ b/sysinv/sysinv/sysinv/setup.cfg
@@ -105,7 +105,6 @@ systemconfig.helm_plugins.stx_openstack =
     022_keystone-api-proxy = sysinv.helm.keystone_api_proxy:KeystoneApiProxyHelm
     023_ceph-rgw = sysinv.helm.swift:SwiftHelm
     024_ironic = sysinv.helm.ironic:IronicHelm
-    025_clients = sysinv.helm.openstackclients:OpenstackClientsHelm
 
 sysinv.agent.lldp.drivers =
     lldpd = sysinv.agent.lldp.drivers.lldpd.driver:SysinvLldpdAgentDriver
diff --git a/sysinv/sysinv/sysinv/sysinv/common/constants.py b/sysinv/sysinv/sysinv/sysinv/common/constants.py
index e766a0653b..4442b5fb87 100644
--- a/sysinv/sysinv/sysinv/sysinv/common/constants.py
+++ b/sysinv/sysinv/sysinv/sysinv/common/constants.py
@@ -1434,7 +1434,6 @@ HELM_CHART_AODH = 'aodh'
 HELM_CHART_BARBICAN = 'barbican'
 HELM_CHART_CEILOMETER = 'ceilometer'
 HELM_CHART_CINDER = 'cinder'
-HELM_CHART_CLIENTS = 'clients'
 HELM_CHART_GARBD = 'garbd'
 HELM_CHART_GLANCE = 'glance'
 HELM_CHART_GNOCCHI = 'gnocchi'
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/openstack.py b/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
index cf90259729..334faa6dcb 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
@@ -73,21 +73,6 @@ class OpenstackBaseHelm(base.BaseHelm):
             constants.HELM_CHART_KEYSTONE]
         return keystone_operator.get_admin_user_name()
 
-    def _get_admin_project_name(self):
-        keystone_operator = self._operator.chart_operators[
-            constants.HELM_CHART_KEYSTONE]
-        return keystone_operator.get_admin_project_name()
-
-    def _get_admin_project_domain(self):
-        keystone_operator = self._operator.chart_operators[
-            constants.HELM_CHART_KEYSTONE]
-        return keystone_operator.get_admin_project_domain()
-
-    def _get_admin_user_domain(self):
-        keystone_operator = self._operator.chart_operators[
-            constants.HELM_CHART_KEYSTONE]
-        return keystone_operator.get_admin_user_domain()
-
     def _get_identity_password(self, service, user):
         passwords = self.context.setdefault('_service_passwords', {})
         if service not in passwords:
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/openstackclients.py b/sysinv/sysinv/sysinv/sysinv/helm/openstackclients.py
deleted file mode 100644
index 8ecd166ad8..0000000000
--- a/sysinv/sysinv/sysinv/sysinv/helm/openstackclients.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2019 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-from sysinv.common import constants
-from sysinv.common import exception
-from sysinv.helm import common
-from sysinv.openstack.common import log as logging
-from sysinv.helm import openstack
-
-LOG = logging.getLogger(__name__)
-
-
-class OpenstackClientsHelm(openstack.OpenstackBaseHelm):
-
-    CHART = constants.HELM_CHART_CLIENTS
-    SERVICE_NAME = constants.HELM_CHART_CLIENTS
-
-    def get_overrides(self, namespace=None):
-
-        overrides = {
-            common.HELM_NS_OPENSTACK: {
-                "endpoints": self._get_endpoints_overrides()
-            }
-        }
-
-        if namespace in self.SUPPORTED_NAMESPACES:
-            return overrides[namespace]
-        elif namespace:
-            raise exception.InvalidHelmNamespace(chart=self.CHART,
-                                                 namespace=namespace)
-        else:
-            return overrides
-
-    def _get_endpoints_overrides(self):
-        overrides = self._get_common_users_overrides(
-                    common.SERVICE_ADMIN)
-        overrides['admin'].update({
-            'project_name': self._get_admin_project_name(),
-            'project_domain_name': self._get_admin_project_domain(),
-            'user_domain_name': self._get_admin_user_domain(),
-        })
-        return {
-            'identity': {
-                'auth': overrides
-            },
-        }