diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml
index 1ac0dd96a4..d796578129 100644
--- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml
+++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/deployment.yaml
@@ -179,7 +179,7 @@ spec:
       initContainers:
 {{- range $i, $c := .Values.initContainers }}
 {{- if .reuseContainerImage}}
-        - name: {{ $.Chart.Name }}-init-{{ add1 $i }}
+        - name: {{ template ".Chart.Name .name" $ }}-init-{{ add1 $i }}
           image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
 {{- if .securityContext }}
@@ -209,7 +209,7 @@ spec:
 {{- end}}
 {{- end}}
       containers:
-        - name: {{ $.Chart.Name }}
+        - name: {{ template ".Chart.Name .name" $ }}
           image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           {{- if $.Values.containerSpec.lifecycle.enabled }}
@@ -540,7 +540,7 @@ spec:
 {{- if $.Values.containers }}
 {{- range $i, $c := .Values.containers }}
 {{- if .reuseContainerImage}}
-        - name: {{ $.Chart.Name }}-sidecontainer-{{ add1 $i }}
+        - name: {{ template ".Chart.Name .name" $ }}-sidecontainer-{{ add1 $i }}
           image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
 {{- if .env }}
@@ -795,7 +795,7 @@ spec:
       initContainers:
 {{- range $i, $c := .Values.initContainers }}
 {{- if .reuseContainerImage}}
-        - name: {{ $.Chart.Name }}-init-{{ add1 $i }}
+        - name: {{ template ".Chart.Name .name" $ }}-init-{{ add1 $i }}
           image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
 {{- if .securityContext }}
@@ -825,7 +825,7 @@ spec:
 {{- end}}
 {{- end}}
       containers:
-        - name: {{ $.Chart.Name }}
+        - name: {{ template ".Chart.Name .name" $ }}
           image: "{{ .Values.server.deployment.image }}:{{ .Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           {{- if $.Values.containerSpec.lifecycle.enabled }}
@@ -1156,7 +1156,7 @@ spec:
 {{- if $.Values.containers }}
 {{- range $i, $c := .Values.containers }}
 {{- if .reuseContainerImage}}
-        - name: {{ $.Chart.Name }}-sidecontainer-{{ add1 $i }}
+        - name: {{ template ".Chart.Name .name" $ }}-sidecontainer-{{ add1 $i }}
           image: "{{ $.Values.server.deployment.image }}:{{ $.Values.server.deployment.image_tag }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
 {{- if .env }}
diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/hpa.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/hpa.yaml
index fd7c7e3f60..3ca57d526a 100644
--- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/hpa.yaml
+++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/hpa.yaml
@@ -43,7 +43,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: cpu
-      container: {{ $.Chart.Name }}
+      container: {{ template ".Chart.Name .name" $ }}
       target:
         type: Utilization
         averageUtilization: {{ .TargetCPUUtilizationPercentage }}
@@ -52,7 +52,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: memory
-      container: {{ $.Chart.Name }}
+      container: {{ template ".Chart.Name .name" $ }}
       target:
         type: Utilization
         averageUtilization: {{ .TargetMemoryUtilizationPercentage }}
@@ -126,7 +126,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: cpu
-      container: {{ $.Chart.Name }}
+      container: {{ template ".Chart.Name .name" $ }}
       target:
         type: Utilization
         averageUtilization: {{ .TargetCPUUtilizationPercentage }}
@@ -135,7 +135,7 @@ spec:
   - type: ContainerResource  
     containerResource:
       name: memory
-      container: {{ $.Chart.Name }}
+      container: {{ template ".Chart.Name .name" $ }}
       target:
         type: Utilization
         averageUtilization: {{ .TargetMemoryUtilizationPercentage }}