diff --git a/data/data/bootstrap/baremetal/files/etc/NetworkManager/conf.d/99-baremetal.conf b/data/data/bootstrap/baremetal/files/etc/NetworkManager/conf.d/99-baremetal.conf
new file mode 100644
index 00000000000..b43e4a80cff
--- /dev/null
+++ b/data/data/bootstrap/baremetal/files/etc/NetworkManager/conf.d/99-baremetal.conf
@@ -0,0 +1,3 @@
+[connection]
+ipv6.dhcp-duid=ll
+ipv6.dhcp-iaid=mac
diff --git a/docs/user/metal/customization_ipi.md b/docs/user/metal/customization_ipi.md
index 4882e310d76..fe7abecf6b5 100644
--- a/docs/user/metal/customization_ipi.md
+++ b/docs/user/metal/customization_ipi.md
@@ -10,9 +10,9 @@
 `clusterProvisioningIP` | The third address on the provisioning network. `172.22.0.3` | The IP within the cluster where the provisioning services run. |
 `bootstrapProvisioningIP` | The second address on the provisioning network. `172.22.0.2` | The IP on the bootstrap VM where the provisioning services run while the control plane is being deployed. |
 `externalBridge` | `baremetal` | The name of the bridge of the hypervisor attached to the external network. |
-`externalMACAddress` | `` | A MAC address to use for the external bridge. This is optional and if blank is generated by libvirt. |
+`externalMACAddress` | `` | A MAC address to use for the external NIC on the bootstrap VM. This is optional and if blank is generated by libvirt. |
 `provisioningBridge` | `provisioning` | The name of the bridge on the hypervisor attached to the provisioning network. |
-`provisioningMACAddress` | `` | A MAC address to use for the provisioning bridge. This is optional and if blank is generated by libvirt. |
+`provisioningMACAddress` | `` | A MAC address to use for the provisioning NIC on the bootstrap VM. This is optional and if blank is generated by libvirt. |
 `provisioningNetworkCIDR` | `172.22.0.0/24` | The CIDR for the network to use for provisioning. |
 `provisioningDHCPExternal` | `false` | Flag indicating that DHCP for the provisioning network is managed outside of the cluster by existing infrastructure services. |
 `provisioningDHCPRange` | The tenth through the second last IP on the provisioning network. `172.22.0.10,172.22.0.254` | The IP range to use for hosts on the provisioning network. |