diff --git a/charts/portkey-gateway/templates/_helpers.tpl b/charts/portkey-gateway/templates/_helpers.tpl
index 65f6a1a..11e9baa 100644
--- a/charts/portkey-gateway/templates/_helpers.tpl
+++ b/charts/portkey-gateway/templates/_helpers.tpl
@@ -52,12 +52,25 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 {{- end }}
 
+{{/*
+Gateway selector labels — adds component label for pod metadata and Service
+selectors. Deployment matchLabels uses portkeyenterprise.selectorLabels
+(without component) to avoid requiring Deployment recreation on upgrade.
+*/}}
+{{- define "gateway.selectorLabels" -}}
+{{ include "portkeyenterprise.selectorLabels" . }}
+{{- $selectorLabels := default (dict) .Values.selectorLabels -}}
+{{- if not (hasKey $selectorLabels "app.kubernetes.io/component") }}
+app.kubernetes.io/component: gateway
+{{- end }}
+{{- end }}
+
 {{/*
 Gateway labels
 */}}
 {{- define "gateway.labels" -}}
 {{- include "portkeyenterprise.labels" . | nindent 4 }}
-{{- include "portkeyenterprise.selectorLabels" . | nindent 4 }}
+{{- include "gateway.selectorLabels" . | nindent 4 }}
 {{- end }}
 
 {{/*
diff --git a/charts/portkey-gateway/templates/gateway/service.yaml b/charts/portkey-gateway/templates/gateway/service.yaml
index 66a9ddb..2f04bb6 100644
--- a/charts/portkey-gateway/templates/gateway/service.yaml
+++ b/charts/portkey-gateway/templates/gateway/service.yaml
@@ -23,7 +23,7 @@ spec:
       name: mcp
     {{- end }}
   selector:
-    {{- include "portkeyenterprise.selectorLabels" . | nindent 4 }}
+    {{- include "gateway.selectorLabels" . | nindent 4 }}
 ---
 {{- if and .Values.mcpService.enabled (eq (include "mcp.enabled" .) "true") }}
 apiVersion: v1
@@ -47,5 +47,5 @@ spec:
       protocol: TCP
       name: mcp
   selector:
-    {{- include "portkeyenterprise.selectorLabels" . | nindent 4 }}
+    {{- include "gateway.selectorLabels" . | nindent 4 }}
 {{- end }}
\ No newline at end of file