diff --git a/examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml b/examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml
index 8ee17bddb..8ea27e42a 100644
--- a/examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml
+++ b/examples/va/nfv/ovs-dpdk-sriov/edpm/values.yaml
@@ -6,6 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  root_password: cmVkaGF0Cg==
   preProvisioned: false
   baremetalSetTemplate:
     ctlplaneInterface: eno2 #CHANGEME
@@ -13,6 +14,9 @@ data:
     provisioningInterface: enp1s0 #CHANGEME
     bmhLabelSelector:
       app: openstack #CHANGEME
+    passwordSecret:
+      name: baremetalset-password-secret
+      namespace: openstack
   ssh_keys:
     # Authorized keys that will have access to the dataplane computes via SSH
     authorized: CHANGEME
diff --git a/examples/va/nfv/ovs-dpdk/edpm/values.yaml b/examples/va/nfv/ovs-dpdk/edpm/values.yaml
index 2b5b96818..4c6642890 100644
--- a/examples/va/nfv/ovs-dpdk/edpm/values.yaml
+++ b/examples/va/nfv/ovs-dpdk/edpm/values.yaml
@@ -6,6 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  root_password: cmVkaGF0Cg==
   preProvisioned: false
   baremetalSetTemplate:
     ctlplaneInterface: eno2 #CHANGEME
@@ -13,6 +14,9 @@ data:
     provisioningInterface: enp1s0 #CHANGEME
     bmhLabelSelector:
       app: openstack #CHANGEME
+    passwordSecret:
+      name: baremetalset-password-secret
+      namespace: openstack
   ssh_keys:
     # Authorized keys that will have access to the dataplane computes via SSH
     authorized: CHANGEME
diff --git a/examples/va/nfv/sriov/edpm/values.yaml b/examples/va/nfv/sriov/edpm/values.yaml
index 645f22d5b..285e63c51 100644
--- a/examples/va/nfv/sriov/edpm/values.yaml
+++ b/examples/va/nfv/sriov/edpm/values.yaml
@@ -6,6 +6,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
 data:
+  root_password: cmVkaGF0Cg==
   preProvisioned: false
   baremetalSetTemplate:
     ctlplaneInterface: eno2 #CHANGEME
@@ -13,6 +14,9 @@ data:
     provisioningInterface: enp1s0 #CHANGEME
     bmhLabelSelector:
       app: openstack #CHANGEME
+    passwordSecret:
+      name: baremetalset-password-secret
+      namespace: openstack
   ssh_keys:
     # Authorized keys that will have access to the dataplane computes via SSH
     authorized: CHANGEME
diff --git a/va/nfv/ovs-dpdk-sriov/edpm/baremetalset-password-secret.yaml b/va/nfv/ovs-dpdk-sriov/edpm/baremetalset-password-secret.yaml
new file mode 100644
index 000000000..4f0b22d9d
--- /dev/null
+++ b/va/nfv/ovs-dpdk-sriov/edpm/baremetalset-password-secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+data:
+  NodeRootPassword: _replaced_
+kind: Secret
+metadata:
+  name: baremetalset-password-secret
+  namespace: openstack
+type: Opaque
diff --git a/va/nfv/ovs-dpdk-sriov/edpm/kustomization.yaml b/va/nfv/ovs-dpdk-sriov/edpm/kustomization.yaml
index f4ce60ac3..14e34c554 100644
--- a/va/nfv/ovs-dpdk-sriov/edpm/kustomization.yaml
+++ b/va/nfv/ovs-dpdk-sriov/edpm/kustomization.yaml
@@ -20,9 +20,23 @@ components:
 - ../../../../lib/dataplane
 
 resources:
+- baremetalset-password-secret.yaml
 - nova_ovs_dpdk_sriov.yaml
 
 replacements:
+- source:
+    kind: ConfigMap
+    name: edpm-values
+    fieldPath: data.root_password
+  targets:
+  - select:
+      kind: Secret
+      name: baremetalset-password-secret
+    fieldPaths:
+    - data.NodeRootPassword
+    options:
+      create: true
+
 # Nova compute CPU pinning customization
 - source:
     kind: ConfigMap
diff --git a/va/nfv/ovs-dpdk/edpm/baremetalset-password-secret.yaml b/va/nfv/ovs-dpdk/edpm/baremetalset-password-secret.yaml
new file mode 100644
index 000000000..4f0b22d9d
--- /dev/null
+++ b/va/nfv/ovs-dpdk/edpm/baremetalset-password-secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+data:
+  NodeRootPassword: _replaced_
+kind: Secret
+metadata:
+  name: baremetalset-password-secret
+  namespace: openstack
+type: Opaque
diff --git a/va/nfv/ovs-dpdk/edpm/kustomization.yaml b/va/nfv/ovs-dpdk/edpm/kustomization.yaml
index bca052dd0..44365f4e7 100644
--- a/va/nfv/ovs-dpdk/edpm/kustomization.yaml
+++ b/va/nfv/ovs-dpdk/edpm/kustomization.yaml
@@ -20,9 +20,23 @@ components:
 - ../../../../lib/dataplane
 
 resources:
+- baremetalset-password-secret.yaml
 - nova_ovs_dpdk.yaml
 
 replacements:
+- source:
+    kind: ConfigMap
+    name: edpm-values
+    fieldPath: data.root_password
+  targets:
+  - select:
+      kind: Secret
+      name: baremetalset-password-secret
+    fieldPaths:
+    - data.NodeRootPassword
+    options:
+      create: true
+
 # Nova compute CPU pinning customization
 - source:
     kind: ConfigMap
diff --git a/va/nfv/sriov/edpm/baremetalset-password-secret.yaml b/va/nfv/sriov/edpm/baremetalset-password-secret.yaml
new file mode 100644
index 000000000..4f0b22d9d
--- /dev/null
+++ b/va/nfv/sriov/edpm/baremetalset-password-secret.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+data:
+  NodeRootPassword: _replaced_
+kind: Secret
+metadata:
+  name: baremetalset-password-secret
+  namespace: openstack
+type: Opaque
diff --git a/va/nfv/sriov/edpm/kustomization.yaml b/va/nfv/sriov/edpm/kustomization.yaml
index 50e30137e..45a34b9fd 100644
--- a/va/nfv/sriov/edpm/kustomization.yaml
+++ b/va/nfv/sriov/edpm/kustomization.yaml
@@ -20,9 +20,23 @@ components:
 - ../../../../lib/dataplane
 
 resources:
+- baremetalset-password-secret.yaml
 - nova_sriov.yaml
 
 replacements:
+- source:
+    kind: ConfigMap
+    name: edpm-values
+    fieldPath: data.root_password
+  targets:
+  - select:
+      kind: Secret
+      name: baremetalset-password-secret
+    fieldPaths:
+    - data.NodeRootPassword
+    options:
+      create: true
+
 # Nova compute CPU pinning customization
 - source:
     kind: ConfigMap