diff --git a/charts/gateway-helm/templates/_helpers.tpl b/charts/gateway-helm/templates/_helpers.tpl
index 6e20238bbccd..8913950c759a 100755
--- a/charts/gateway-helm/templates/_helpers.tpl
+++ b/charts/gateway-helm/templates/_helpers.tpl
@@ -71,7 +71,7 @@ provider:
         image: {{ .Values.images.ratelimit.repository }}:{{ .Values.images.ratelimit.tag | default "master" }}
         {{- end }}
     shutdownManager:
-      {{- if .Values.images.shutdownManager.repository }}
-      image: {{ .Values.images.shutdownManager.repository }}:{{ .Values.images.shutdownManager.tag | default "latest" }}
+      {{- if .Values.images.envoyGateway.repository }}
+      image: {{ .Values.images.envoyGateway.repository }}:{{ .Values.images.envoyGateway.tag | default .Chart.AppVersion }}
       {{- end }}
 {{- end }}
diff --git a/charts/gateway-helm/values.tmpl.yaml b/charts/gateway-helm/values.tmpl.yaml
index 7da51eb412f8..3d4c7e637d57 100644
--- a/charts/gateway-helm/values.tmpl.yaml
+++ b/charts/gateway-helm/values.tmpl.yaml
@@ -4,9 +4,6 @@ images:
   envoyGateway:
     repository: ${ImageRepository}
     tag: '${ImageTag}'
-  shutdownManager:
-    repository: ${ImageRepository}
-    tag: '${ImageTag}'
   ratelimit:
     repository: docker.io/envoyproxy/ratelimit
     tag: 'master'