diff --git a/charts/openg2p-pbms-p2/values.yaml b/charts/openg2p-pbms-p2/values.yaml
index 431c5aa..ec9f83c 100644
--- a/charts/openg2p-pbms-p2/values.yaml
+++ b/charts/openg2p-pbms-p2/values.yaml
@@ -9,7 +9,7 @@ superset:
   hostname: superset-pbms.openg2p.sandbox.net
 
   oidcIssuerUrl: '{{ tpl .Values.global.keycloakIssuerUrl $ }}'
-  oidcClientId: openg2p-pbms-superset
+  oidcClientId: 'openg2p-pbms-superset-{{ .Release.Namespace }}'
   oidcClientSecret: ''
 
   supersetSecretKey: ''
diff --git a/charts/openg2p-pbms/values.yaml b/charts/openg2p-pbms/values.yaml
index d23a4ff..08ca78e 100644
--- a/charts/openg2p-pbms/values.yaml
+++ b/charts/openg2p-pbms/values.yaml
@@ -120,7 +120,7 @@ odk-central:
   backend:
     envVars:
       OIDC_ISSUER_URL: '{{ tpl .Values.global.keycloakIssuerUrl $ }}'
-      OIDC_CLIENT_ID: openg2p-pbms-odk
+      OIDC_CLIENT_ID: 'openg2p-pbms-odk-{{ .Release.Namespace }}'
       OIDC_CLIENT_SECRET: ""
 
 minio:
@@ -131,7 +131,7 @@ minio:
     size: 16Gi
 
   oidcWellKnownConfigUrl: '{{ tpl .Values.global.keycloakIssuerUrl $ }}/.well-known/openid-configuration'
-  oidcClientId: openg2p-pbms-minio
+  oidcClientId: 'openg2p-pbms-minio-{{ .Release.Namespace }}'
   oidcClientSecret: ''
 
   extraEnvVars:
@@ -178,7 +178,7 @@ loggingOpensearch:
   hostname: opensearch-logging-pbms.openg2p.sandbox.net
 
   oidcWellKnownConfigUrl: '{{ tpl .Values.global.keycloakIssuerUrl $ }}/.well-known/openid-configuration'
-  oidcClientId: openg2p-pbms-logging-opensearch
+  oidcClientId: 'openg2p-pbms-logging-opensearch-{{ .Release.Namespace }}'
   oidcClientSecret: ''
 
   master:
@@ -360,12 +360,12 @@ reporting:
   kafkaUi:
     enabled: true
     hostname: kafka-reporting-pbms.openg2p.sandbox.net
-    oidcClientId: 'openg2p-pbms-reporting-kafka'
+    oidcClientId: 'openg2p-pbms-reporting-kafka-{{ .Release.Namespace }}'
     oidcClientSecret: ''
   opensearch:
     enabled: true
     hostname: opensearch-reporting-pbms.openg2p.sandbox.net
-    oidcClientId: 'openg2p-pbms-reporting-opensearch'
+    oidcClientId: 'openg2p-pbms-reporting-opensearch-{{ .Release.Namespace }}'
     oidcClientSecret: ''
 
 reporting-init: