diff --git a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl
index 75b74253..31fa205c 100644
--- a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl
+++ b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- if .Values.manifests.service }}
 {{- $envAll := . }}
 ---
 apiVersion: v1
@@ -22,6 +21,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{ .Values.service.name }}-service: enabled
+{{ tuple $envAll "kubernetes" "apiserver" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   hostNetwork: true
   containers:
@@ -64,4 +64,3 @@ spec:
     - name: etc
       hostPath:
         path: {{ .Values.apiserver.host_etc_path }}
-{{- end }}
diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml
index fcac4e1c..1166a0fd 100644
--- a/charts/apiserver/values.yaml
+++ b/charts/apiserver/values.yaml
@@ -23,8 +23,8 @@ images:
 
 labels:
   kubernetes_apiserver:
-      node_selector_key: kubernetes-apiserver
-      node_selector_value: enabled
+    node_selector_key: kubernetes-apiserver
+    node_selector_value: enabled
 
 anchor:
   dns_policy: Default
diff --git a/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl b/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl
index bfb80d5c..3bb14436 100644
--- a/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl
+++ b/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- $envAll := . }}
 ---
 apiVersion: v1
 kind: Pod
@@ -20,6 +21,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{ .Values.service.name }}-service: enabled
+{{ tuple $envAll "kubernetes" "controller-manager" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   hostNetwork: true
   containers:
diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml
index 306a0c41..c0650902 100644
--- a/charts/controller_manager/values.yaml
+++ b/charts/controller_manager/values.yaml
@@ -23,8 +23,8 @@ images:
 
 labels:
   controller_manager:
-      node_selector_key: kubernetes-controller-manager
-      node_selector_value: enabled
+    node_selector_key: kubernetes-controller-manager
+    node_selector_value: enabled
 
 anchor:
   dns_policy: Default
diff --git a/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl b/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl
index 7e6183eb..97fdc9be 100644
--- a/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl
+++ b/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl
@@ -14,14 +14,16 @@
 # limitations under the License.
 */}}
 
+{{- $envAll := . }}
 ---
 apiVersion: v1
 kind: Pod
 metadata:
-  name: kubernetes-scheduler
+  name: {{ .Values.service.name }}
   namespace: {{ .Release.Namespace }}
   labels:
-    kubernetes-scheduler-service: enabled
+    {{ .Values.service.name }}-service: enabled
+{{ tuple $envAll "kubernetes" "scheduler" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   hostNetwork: true
   containers:
diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml
index 9427256c..935c4de3 100644
--- a/charts/scheduler/values.yaml
+++ b/charts/scheduler/values.yaml
@@ -20,8 +20,8 @@ anchor:
 
 labels:
   scheduler:
-      node_selector_key: kubernetes-scheduler
-      node_selector_value: enabled
+    node_selector_key: kubernetes-scheduler
+    node_selector_value: enabled
 
 pod:
   lifecycle:
@@ -63,6 +63,9 @@ images:
 network:
   kubernetes_netloc: 10.96.0.1
 
+service:
+  name: kubernetes-scheduler
+
 command_prefix:
   - /scheduler
   - --v=5