diff --git a/charts/accessnode/Chart.yaml b/charts/accessnode/Chart.yaml
index 59f0346..ac8f06c 100644
--- a/charts/accessnode/Chart.yaml
+++ b/charts/accessnode/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: accessnode
 description: A Helm chart for creating an access node
 type: application
-version: "1.0.4"
+version: "1.0.5"
 appVersion: "1"
diff --git a/charts/accessnode/templates/_cv.tpl b/charts/accessnode/templates/_cv.tpl
index 5399b7b..9d9798a 100644
--- a/charts/accessnode/templates/_cv.tpl
+++ b/charts/accessnode/templates/_cv.tpl
@@ -190,6 +190,14 @@ cv.commonenv creates environment variables that are common to all deployments
               fieldPath: status.podIP
         - name: CV_IS_STATEFULSET  
           value: 'true'
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
         - name: CV_DNS_SUFFIX
           # dns suffix of the client
           value: {{ .Values.serviceName | default $objectname }}.{{- include "cv.namespace" . }}.{{ or (.Values.global).clusterDomain "svc.cluster.local" }}
@@ -203,6 +211,10 @@ cv.commonenv creates environment variables that are common to all deployments
           {{- else }}
           value: {{ .Release.Name }}
           {{- end }}
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
         - name: CV_CLIENT_HOSTNAME
           # hostname of the client should match the service name.
           value: {{ include "cv.hostname" . }}
@@ -216,6 +228,10 @@ cv.commonenv creates environment variables that are common to all deployments
         - name: CV_CSHOSTNAME
           value: {{ .Values.csOrGatewayHostName }}
         {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
       {{- if eq (include "cv.useInitContainer" .) "false" }}
         {{- if ((.Values).secret).user }}
         - name: CV_COMMCELL_USER
diff --git a/charts/commandcenter/Chart.yaml b/charts/commandcenter/Chart.yaml
index 1dfc2d2..5c373e3 100644
--- a/charts/commandcenter/Chart.yaml
+++ b/charts/commandcenter/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: commandcenter
 description: A Helm chart for creating the command center
 type: application
-version: "1.0.4"
+version: "1.0.5"
 appVersion: "1"
diff --git a/charts/commandcenter/templates/_cv.tpl b/charts/commandcenter/templates/_cv.tpl
index 5399b7b..9d9798a 100644
--- a/charts/commandcenter/templates/_cv.tpl
+++ b/charts/commandcenter/templates/_cv.tpl
@@ -190,6 +190,14 @@ cv.commonenv creates environment variables that are common to all deployments
               fieldPath: status.podIP
         - name: CV_IS_STATEFULSET  
           value: 'true'
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
         - name: CV_DNS_SUFFIX
           # dns suffix of the client
           value: {{ .Values.serviceName | default $objectname }}.{{- include "cv.namespace" . }}.{{ or (.Values.global).clusterDomain "svc.cluster.local" }}
@@ -203,6 +211,10 @@ cv.commonenv creates environment variables that are common to all deployments
           {{- else }}
           value: {{ .Release.Name }}
           {{- end }}
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
         - name: CV_CLIENT_HOSTNAME
           # hostname of the client should match the service name.
           value: {{ include "cv.hostname" . }}
@@ -216,6 +228,10 @@ cv.commonenv creates environment variables that are common to all deployments
         - name: CV_CSHOSTNAME
           value: {{ .Values.csOrGatewayHostName }}
         {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
       {{- if eq (include "cv.useInitContainer" .) "false" }}
         {{- if ((.Values).secret).user }}
         - name: CV_COMMCELL_USER
diff --git a/charts/config/Chart.yaml b/charts/config/Chart.yaml
index bd0480f..804f950 100644
--- a/charts/config/Chart.yaml
+++ b/charts/config/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: config
 description: A Helm chart for creating the base configuration and secret  for all cv components in the namespace
 type: application
-version: "1.0.4"
+version: "1.0.5"
 appVersion: "1"
diff --git a/charts/config/templates/_cv.tpl b/charts/config/templates/_cv.tpl
index 5399b7b..9d9798a 100644
--- a/charts/config/templates/_cv.tpl
+++ b/charts/config/templates/_cv.tpl
@@ -190,6 +190,14 @@ cv.commonenv creates environment variables that are common to all deployments
               fieldPath: status.podIP
         - name: CV_IS_STATEFULSET  
           value: 'true'
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
         - name: CV_DNS_SUFFIX
           # dns suffix of the client
           value: {{ .Values.serviceName | default $objectname }}.{{- include "cv.namespace" . }}.{{ or (.Values.global).clusterDomain "svc.cluster.local" }}
@@ -203,6 +211,10 @@ cv.commonenv creates environment variables that are common to all deployments
           {{- else }}
           value: {{ .Release.Name }}
           {{- end }}
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
         - name: CV_CLIENT_HOSTNAME
           # hostname of the client should match the service name.
           value: {{ include "cv.hostname" . }}
@@ -216,6 +228,10 @@ cv.commonenv creates environment variables that are common to all deployments
         - name: CV_CSHOSTNAME
           value: {{ .Values.csOrGatewayHostName }}
         {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
       {{- if eq (include "cv.useInitContainer" .) "false" }}
         {{- if ((.Values).secret).user }}
         - name: CV_COMMCELL_USER
diff --git a/charts/config/templates/config.yaml b/charts/config/templates/config.yaml
index 6660c2e..2ea82f0 100644
--- a/charts/config/templates/config.yaml
+++ b/charts/config/templates/config.yaml
@@ -6,4 +6,6 @@ metadata:
 data:  
   # host name of the Commserve or gateway
   CV_CSHOSTNAME: {{ tpl .Values.csOrGatewayHostName . }}
-
+  {{- if .Values.csClientName }}
+  CV_CSCLIENTNAME: {{ tpl .Values.csClientName . }}
+  {{- end }}
diff --git a/charts/config/values.yaml b/charts/config/values.yaml
index 19e57cc..c0315c9 100644
--- a/charts/config/values.yaml
+++ b/charts/config/values.yaml
@@ -1,5 +1,5 @@
 # csOrGatewayHostName:  # Required. host name of the Commserve or gateway. To specify a port number, use hostname:port format
-
+# csClientName:         # Optional. client name of the Commserve
 # secret:               # username/password or authcode used for registering the commvault components with the commserve
                         # when installing the commserve component the user and password is required for first user
   # user:               # Optional. Plain text user name used for install.
@@ -7,6 +7,7 @@
   # authcode:           # Optional. Authcode can be given in place of username/password
   # CCCertificate       # Optional. Certificate for Command Center.
   # CCCertificatePassword # Optional. Plain text password for Command Center certificate.
+  # sa_password:        # Optional. Plain text password for SQL Server sa user.
 
 # Optional. If pullsecret.create=true then an image pull secret will be created.
 # pullsecret:
diff --git a/charts/cs/Chart.yaml b/charts/cs/Chart.yaml
index 14067f7..d720884 100644
--- a/charts/cs/Chart.yaml
+++ b/charts/cs/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: commserve
 description: A Helm chart for creating the CS component
 type: application
-version: "1.0.4"
+version: "1.0.5"
 appVersion: "1"
diff --git a/charts/cs/templates/_cv.tpl b/charts/cs/templates/_cv.tpl
index 5399b7b..9d9798a 100644
--- a/charts/cs/templates/_cv.tpl
+++ b/charts/cs/templates/_cv.tpl
@@ -190,6 +190,14 @@ cv.commonenv creates environment variables that are common to all deployments
               fieldPath: status.podIP
         - name: CV_IS_STATEFULSET  
           value: 'true'
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
         - name: CV_DNS_SUFFIX
           # dns suffix of the client
           value: {{ .Values.serviceName | default $objectname }}.{{- include "cv.namespace" . }}.{{ or (.Values.global).clusterDomain "svc.cluster.local" }}
@@ -203,6 +211,10 @@ cv.commonenv creates environment variables that are common to all deployments
           {{- else }}
           value: {{ .Release.Name }}
           {{- end }}
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
         - name: CV_CLIENT_HOSTNAME
           # hostname of the client should match the service name.
           value: {{ include "cv.hostname" . }}
@@ -216,6 +228,10 @@ cv.commonenv creates environment variables that are common to all deployments
         - name: CV_CSHOSTNAME
           value: {{ .Values.csOrGatewayHostName }}
         {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
       {{- if eq (include "cv.useInitContainer" .) "false" }}
         {{- if ((.Values).secret).user }}
         - name: CV_COMMCELL_USER
diff --git a/charts/mediaagent/Chart.yaml b/charts/mediaagent/Chart.yaml
index 15e0944..8e85ac8 100644
--- a/charts/mediaagent/Chart.yaml
+++ b/charts/mediaagent/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: mediaagent
 description: A Helm chart for creating a media agent
 type: application
-version: "1.0.4"
+version: "1.0.5"
 appVersion: "1"
diff --git a/charts/mediaagent/templates/_cv.tpl b/charts/mediaagent/templates/_cv.tpl
index 5399b7b..9d9798a 100644
--- a/charts/mediaagent/templates/_cv.tpl
+++ b/charts/mediaagent/templates/_cv.tpl
@@ -190,6 +190,14 @@ cv.commonenv creates environment variables that are common to all deployments
               fieldPath: status.podIP
         - name: CV_IS_STATEFULSET  
           value: 'true'
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
         - name: CV_DNS_SUFFIX
           # dns suffix of the client
           value: {{ .Values.serviceName | default $objectname }}.{{- include "cv.namespace" . }}.{{ or (.Values.global).clusterDomain "svc.cluster.local" }}
@@ -203,6 +211,10 @@ cv.commonenv creates environment variables that are common to all deployments
           {{- else }}
           value: {{ .Release.Name }}
           {{- end }}
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
         - name: CV_CLIENT_HOSTNAME
           # hostname of the client should match the service name.
           value: {{ include "cv.hostname" . }}
@@ -216,6 +228,10 @@ cv.commonenv creates environment variables that are common to all deployments
         - name: CV_CSHOSTNAME
           value: {{ .Values.csOrGatewayHostName }}
         {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
       {{- if eq (include "cv.useInitContainer" .) "false" }}
         {{- if ((.Values).secret).user }}
         - name: CV_COMMCELL_USER
diff --git a/charts/networkgateway/Chart.yaml b/charts/networkgateway/Chart.yaml
index 2d5a270..5667d57 100644
--- a/charts/networkgateway/Chart.yaml
+++ b/charts/networkgateway/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: networkgateway
 description: A Helm chart for creating an FS agent which can serve as a network gateway
 type: application
-version: "1.0.4"
+version: "1.0.5"
 appVersion: "1"
diff --git a/charts/networkgateway/templates/_cv.tpl b/charts/networkgateway/templates/_cv.tpl
index 5399b7b..9d9798a 100644
--- a/charts/networkgateway/templates/_cv.tpl
+++ b/charts/networkgateway/templates/_cv.tpl
@@ -190,6 +190,14 @@ cv.commonenv creates environment variables that are common to all deployments
               fieldPath: status.podIP
         - name: CV_IS_STATEFULSET  
           value: 'true'
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
         - name: CV_DNS_SUFFIX
           # dns suffix of the client
           value: {{ .Values.serviceName | default $objectname }}.{{- include "cv.namespace" . }}.{{ or (.Values.global).clusterDomain "svc.cluster.local" }}
@@ -203,6 +211,10 @@ cv.commonenv creates environment variables that are common to all deployments
           {{- else }}
           value: {{ .Release.Name }}
           {{- end }}
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
         - name: CV_CLIENT_HOSTNAME
           # hostname of the client should match the service name.
           value: {{ include "cv.hostname" . }}
@@ -216,6 +228,10 @@ cv.commonenv creates environment variables that are common to all deployments
         - name: CV_CSHOSTNAME
           value: {{ .Values.csOrGatewayHostName }}
         {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
       {{- if eq (include "cv.useInitContainer" .) "false" }}
         {{- if ((.Values).secret).user }}
         - name: CV_COMMCELL_USER
diff --git a/charts/webserver/Chart.yaml b/charts/webserver/Chart.yaml
index ce65d9c..8501730 100644
--- a/charts/webserver/Chart.yaml
+++ b/charts/webserver/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: webserver
 description: A Helm chart for creating the webserver
 type: application
-version: "1.0.4"
+version: "1.0.5"
 appVersion: "1"
diff --git a/charts/webserver/templates/_cv.tpl b/charts/webserver/templates/_cv.tpl
index 5399b7b..9d9798a 100644
--- a/charts/webserver/templates/_cv.tpl
+++ b/charts/webserver/templates/_cv.tpl
@@ -190,6 +190,14 @@ cv.commonenv creates environment variables that are common to all deployments
               fieldPath: status.podIP
         - name: CV_IS_STATEFULSET  
           value: 'true'
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
         - name: CV_DNS_SUFFIX
           # dns suffix of the client
           value: {{ .Values.serviceName | default $objectname }}.{{- include "cv.namespace" . }}.{{ or (.Values.global).clusterDomain "svc.cluster.local" }}
@@ -203,6 +211,10 @@ cv.commonenv creates environment variables that are common to all deployments
           {{- else }}
           value: {{ .Release.Name }}
           {{- end }}
+        {{- if ((.Values).secret).sa_password }}
+        - name: CV_SA_PWD
+          value: {{ tpl .Values.secret.sa_password . }}
+        {{- end }}
         - name: CV_CLIENT_HOSTNAME
           # hostname of the client should match the service name.
           value: {{ include "cv.hostname" . }}
@@ -216,6 +228,10 @@ cv.commonenv creates environment variables that are common to all deployments
         - name: CV_CSHOSTNAME
           value: {{ .Values.csOrGatewayHostName }}
         {{- end }}
+        {{- if .Values.csClientName }}
+        - name: CV_CSCLIENTNAME
+          value: {{ .Values.csClientName }}
+        {{- end }}
       {{- if eq (include "cv.useInitContainer" .) "false" }}
         {{- if ((.Values).secret).user }}
         - name: CV_COMMCELL_USER