diff --git a/components/node/kustomization.yaml b/components/node/kustomization.yaml
index c06a74e..1f73115 100644
--- a/components/node/kustomization.yaml
+++ b/components/node/kustomization.yaml
@@ -40,4 +40,5 @@ configMapGenerator:
   - files/scripts/readiness-local.sh
 
 replacements:
+- path: replacements/svc.yaml
 - path: replacements/statefulset.yaml
diff --git a/components/node/replacements/services.yaml b/components/node/replacements/services.yaml
index d325149..5a3a3b6 100644
--- a/components/node/replacements/services.yaml
+++ b/components/node/replacements/services.yaml
@@ -1,20 +1,15 @@
-- source:
-    kind: ConfigMap
-    name: valkey-env
-    fieldPath: data.VALKEY_HEADLESS_SERVICE
-  targets:
-  - select:
-      kind: Service
-      name: valkey-headless
-    fieldPaths:
-    - metadata.name
 - source:
     kind: ConfigMap
     name: valkey-env
     fieldPath: data.VALKEY_SERVICE
   targets:
+  - select:
+      kind: Service
+      name: valkey-headless
+    fieldPaths:
+    - spec.selector.app
   - select:
       kind: Service
       name: valkey
     fieldPaths:
-    - metadata.name
+    - spec.selector.app
diff --git a/components/node/resources/svc.yaml b/components/node/resources/svc.yaml
index 6c0b102..53ec321 100644
--- a/components/node/resources/svc.yaml
+++ b/components/node/resources/svc.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app: CHANGE_ME
     app.kubernetes.io/component: node
     app.kubernetes.io/instance: valkey
     app.kubernetes.io/managed-by: kustomize
@@ -20,6 +21,7 @@ spec:
     protocol: TCP
     targetPort: 26379
   selector:
+    app: CHANGE_ME
     app.kubernetes.io/component: node
     app.kubernetes.io/instance: valkey
     app.kubernetes.io/name: valkey
@@ -28,10 +30,11 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app: CHANGE_ME
     app.kubernetes.io/component: node
     app.kubernetes.io/instance: valkey
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/name: valkey
+    app.kubernetes.io/name: valkey-headless
     app.kubernetes.io/part-of: valkey
     app.kubernetes.io/version: 8.1.1
   name: valkey-headless
@@ -48,5 +51,6 @@ spec:
     targetPort: valkey-sentinel
   publishNotReadyAddresses: true
   selector:
+    app: CHANGE_ME
     app.kubernetes.io/instance: valkey
     app.kubernetes.io/name: valkey