diff --git a/charts/pcns/templates/deploymentconfig.yaml b/charts/pcns/templates/deploymentconfig.yaml
index 62416ebc..00d2fa44 100644
--- a/charts/pcns/templates/deploymentconfig.yaml
+++ b/charts/pcns/templates/deploymentconfig.yaml
@@ -132,12 +132,12 @@ spec:
               valueFrom:
                 secretKeyRef:
                   key: username
-                  name: ches-service-account
+                  name: {{ include "pcns.configname" . }}-ches-service-account
             - name: SERVER_CHES_CLIENTSECRET
               valueFrom:
                 secretKeyRef:
                   key: password
-                  name: ches-service-account
+                  name: {{ include "pcns.configname" . }}-ches-service-account
             - name: SERVER_DB_HOST
               value: {{ $dbHostName }}
             - name: SERVER_DB_USERNAME
diff --git a/charts/pcns/templates/secret.yaml b/charts/pcns/templates/secret.yaml
index 51f63360..15575a52 100644
--- a/charts/pcns/templates/secret.yaml
+++ b/charts/pcns/templates/secret.yaml
@@ -15,7 +15,7 @@
 {{- $f1Secret := (lookup "v1" "Secret" .Release.Namespace $f1SecretName ) }}
 {{- $f2SecretName := printf "%s-%s" (include "pcns.configname" .) "form2" }}
 {{- $f2Secret := (lookup "v1" "Secret" .Release.Namespace $f2SecretName ) }}
-{{- $chesSecretName := printf "%s-%s" "ches-service-account" }}
+{{- $chesSecretName := printf "%s-%s" (include "pcns.configname" .) "ches-service-account" }}
 {{- $chesSecret := (lookup "v1" "Secret" .Release.Namespace $chesSecretName ) }}
 {{- $oSecretName := printf "%s-%s" (include "pcns.configname" .) "oidc" }}
 {{- $oSecret := (lookup "v1" "Secret" .Release.Namespace $oSecretName ) }}