diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
index a46470462..bef3bb7bb 100644
--- a/config/base/kustomization.yaml
+++ b/config/base/kustomization.yaml
@@ -19,21 +19,24 @@ resources:
   - deployment.yaml
   - networkpolicy.yaml
 
-vars:
-  - name: MM_SERVICE_NAME
-    objref:
-      kind: Service
+replacements:
+- source:
+    kind: Service
+    name: model-mesh
+    fieldPath: metadata.name
+  targets:
+  - select:
+      kind: Deployment
       name: model-mesh
-      apiVersion: v1
-    fieldref:
-      fieldpath: metadata.name
+    fieldPaths:
+    - spec.template.spec.containers.0.env.[name=MM_SERVICE_NAME].value
 
 ### Available patches:
 
-#patchesStrategicMerge:
-#  - patches/etcd.yaml
-#  - patches/logger.yaml
-#  - patches/tls.yaml
-#  - patches/uds.yaml
-#  - patches/max_msg_size.yaml
-#  - patches/prometheus_metrics.yaml
+# patches:
+#  - path: patches/etcd.yaml
+#  - path: patches/logger.yaml
+#  - path: patches/tls.yaml
+#  - path: patches/uds.yaml
+#  - path: patches/max_msg_size.yaml
+#  - path: patches/prometheus_metrics.yaml