diff --git a/helm-chart/kuberay-apiserver/templates/deployment.yaml b/helm-chart/kuberay-apiserver/templates/deployment.yaml
index 956738c1a0..6edad56c6d 100644
--- a/helm-chart/kuberay-apiserver/templates/deployment.yaml
+++ b/helm-chart/kuberay-apiserver/templates/deployment.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ .Values.name }}
   labels:
 {{ include "kuberay-apiserver.labels" . | indent 4 }}
+{{- if .Values.labels }}
+{{- toYaml .Values.labels | nindent 4 }}
+{{- end }}
 spec:
   selector:
     matchLabels:
@@ -15,6 +18,13 @@ spec:
       labels:
         app.kubernetes.io/component: {{ include "kuberay-apiserver.name" . }}
         app.kubernetes.io/name: {{ .Release.Name }}
+        {{- if .Values.labels }}
+        {{- toYaml .Values.labels | nindent 8 }}
+        {{- end }}
+      {{- if .Values.annotations }}
+      annotations:
+        {{- toYaml .Values.annotations | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount.name }}
       containers:
diff --git a/helm-chart/kuberay-operator/templates/deployment.yaml b/helm-chart/kuberay-operator/templates/deployment.yaml
index fa9b4c1a9c..d88d001453 100644
--- a/helm-chart/kuberay-operator/templates/deployment.yaml
+++ b/helm-chart/kuberay-operator/templates/deployment.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ include "kuberay-operator.fullname" . }}
   labels:
 {{ include "kuberay-operator.labels" . | indent 4 }}
+{{- if .Values.labels }}
+{{- toYaml .Values.labels | nindent 4 }}
+{{- end }}
 spec:
   replicas: 1
   strategy: