diff --git a/examples/va/hci/edpm-pre-ceph/values.yaml b/examples/va/hci/edpm-pre-ceph/values.yaml
index 1dc135e55..d24950482 100644
--- a/examples/va/hci/edpm-pre-ceph/values.yaml
+++ b/examples/va/hci/edpm-pre-ceph/values.yaml
@@ -8,6 +8,8 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  deployment:
+    name: edpm-deployment-pre-ceph
   ssh_keys:
     # Authorized keys that will have access to the dataplane computes via SSH
     authorized: CHANGEME
diff --git a/examples/va/hci/values.yaml b/examples/va/hci/values.yaml
index 14ec8ee0d..4160e1c8a 100644
--- a/examples/va/hci/values.yaml
+++ b/examples/va/hci/values.yaml
@@ -7,6 +7,8 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  deployment:
+    name: edpm-deployment-post-ceph
   nodeset:
     services:
       - ceph-client
diff --git a/va/hci/edpm-post-ceph/kustomization.yaml b/va/hci/edpm-post-ceph/kustomization.yaml
index fde044388..1b632142d 100644
--- a/va/hci/edpm-post-ceph/kustomization.yaml
+++ b/va/hci/edpm-post-ceph/kustomization.yaml
@@ -26,13 +26,6 @@ resources:
   - nova_ceph.yaml
 
 patches:
-  - target:
-      kind: OpenStackDataPlaneDeployment
-      name: .*
-    patch: |-
-      - op: replace
-        path: /metadata/name
-        value: edpm-deployment-post-ceph
   - target:
       kind: OpenStackDataPlaneNodeSet
       name: .*
@@ -180,3 +173,14 @@ replacements:
           - spec.services
         options:
           create: true
+  - source:
+      kind: ConfigMap
+      name: edpm-values-post-ceph
+      fieldPath: data.deployment.name
+    targets:
+      - select:
+          kind: OpenStackDataPlaneDeployment
+        fieldPaths:
+          - metadata.name
+        options:
+          create: true
diff --git a/va/hci/edpm-pre-ceph/kustomization.yaml b/va/hci/edpm-pre-ceph/kustomization.yaml
index 029197690..97941fdd5 100644
--- a/va/hci/edpm-pre-ceph/kustomization.yaml
+++ b/va/hci/edpm-pre-ceph/kustomization.yaml
@@ -20,11 +20,15 @@ transformers:
 components:
   - ../../../lib/dataplane
 
-patches:
-  - target:
-      kind: OpenStackDataPlaneDeployment
-      name: .*
-    patch: |-
-      - op: replace
-        path: /metadata/name
-        value: edpm-deployment-pre-ceph
+replacements:
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.deployment.name
+    targets:
+      - select:
+          kind: OpenStackDataPlaneDeployment
+        fieldPaths:
+          - metadata.name
+        options:
+          create: true