diff --git a/config/samples/dataplane_v1beta1_openstackdataplane_baremetal_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplane_baremetal_with_ipam.yaml
deleted file mode 120000
index 92b6662a9..000000000
--- a/config/samples/dataplane_v1beta1_openstackdataplane_baremetal_with_ipam.yaml
+++ /dev/null
@@ -1 +0,0 @@
-dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml
\ No newline at end of file
diff --git a/config/samples/dataplane_v1beta1_openstackdataplane_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplane_with_ipam.yaml
deleted file mode 120000
index b834a2f12..000000000
--- a/config/samples/dataplane_v1beta1_openstackdataplane_with_ipam.yaml
+++ /dev/null
@@ -1 +0,0 @@
-dataplane_v1beta1_openstackdataplanenodeset.yaml
\ No newline at end of file
diff --git a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml
index 496bbc5ac..dfe89371e 100644
--- a/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml
+++ b/config/samples/dataplane_v1beta1_openstackdataplanenodeset_with_ipam.yaml
@@ -3,15 +3,11 @@ kind: OpenStackDataPlaneNodeSet
 metadata:
   name: openstack-edpm-ipam
 spec:
-  ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret
   env:
     - name: ANSIBLE_FORCE_COLOR
       value: "True"
     - name: ANSIBLE_ENABLE_TASK_DEBUGGER
       value: "True"
-  preProvisioned: true
-  deployStrategy:
-    deploy: true
   services:
     - configure-network
     - validate-network
@@ -21,60 +17,26 @@ spec:
     - ovn
     - libvirt
     - nova
-  baremetalSetTemplate:
-    deploymentSSHSecret: dataplane-ansible-ssh-private-key-secret
-    bmhLabelSelector:
-      app: openstack
-    ctlplaneInterface: enp1s0
-    dnsSearchDomains:
-      - osptest.openstack.org
+  deployStrategy:
+      deploy: true
   nodeTemplate:
+    ansibleSSHPrivateKeySecret: dataplane-ansible-ssh-private-key-secret
     nodes:
        edpm-compute-0:
          hostName: edpm-compute-0
-         ansible:
-           ansibleHost: 192.168.111.100
-           ansibleVars:
-             ctlplane_ip: 192.168.111.100
-             internal_api_ip: 172.17.0.100
-             storage_ip: 172.18.0.100
-             tenant_ip: 172.19.0.100
-             fqdn_internal_api: edpm-compute-0.example.com
-         networks:
-         - name: CtlPlane
-           subnetName: subnet1
-           defaultRoute: true
-           fixedIP: 192.168.111.100
-         - name: InternalApi
-           subnetName: subnet1
-         - name: Storage
-           subnetName: subnet1
-         - name: Tenant
-           subnetName: subnet1
-       edpm-compute-1:
-         hostName: edpm-compute-1
-         ansible:
-           ansibleHost: 192.168.111.101
-           ansibleVars:
-             ctlplane_ip: 192.168.111.101
-             internal_api_ip: 172.17.0.101
-             storage_ip: 172.18.0.101
-             tenant_ip: 172.19.0.101
-             fqdn_internal_api: edpm-compute-1.example.com
-         networks:
-         - name: CtlPlane
-           subnetName: subnet1
-           defaultRoute: true
-           fixedIP: 192.168.111.101
-         - name: InternalApi
-           subnetName: subnet1
-         - name: Storage
-           subnetName: subnet1
-         - name: Tenant
-           subnetName: subnet1
+    networks:
+      - name: CtlPlane
+        subnetName: subnet1
+        defaultRoute: true
+      - name: InternalApi
+        subnetName: subnet1
+      - name: Storage
+        subnetName: subnet1
+      - name: Tenant
+        subnetName: subnet1
     managementNetwork: ctlplane
     ansible:
-      ansibleUser: cloud-admin
+      ansibleUser: root
       ansiblePort: 22
       ansibleVars:
          service_net_map:
@@ -87,32 +49,11 @@ spec:
          # Default nic config template for a EDPM compute node
          # These vars are edpm_network_config role vars
          edpm_network_config_hide_sensitive_logs: false
+         edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
          # These vars are for the network config templates themselves and are
          # considered EDPM network defaults.
          neutron_physical_bridge_name: br-ex
          neutron_public_interface_name: eth0
-         ctlplane_mtu: 1500
-         ctlplane_subnet_cidr: 24
-         ctlplane_gateway_ip: 192.168.111.1
-         ctlplane_host_routes:
-         - ip_netmask: 0.0.0.0/0
-           next_hop: 192.168.111.1
-         external_mtu: 1500
-         external_vlan_id: 44
-         external_cidr: '24'
-         external_host_routes: []
-         internal_api_mtu: 1500
-         internal_api_vlan_id: 20
-         internal_api_cidr: '24'
-         internal_api_host_routes: []
-         storage_mtu: 1500
-         storage_vlan_id: 21
-         storage_cidr: '24'
-         storage_host_routes: []
-         tenant_mtu: 1500
-         tenant_vlan_id: 22
-         tenant_cidr: '24'
-         tenant_host_routes: []
          role_networks:
          - InternalApi
          - Storage
@@ -130,11 +71,8 @@ spec:
          edpm_ovn_metadata_agent_metadata_agent_DEFAULT_nova_metadata_host: 127.0.0.1
          edpm_ovn_metadata_agent_metadata_agent_DEFAULT_metadata_proxy_shared_secret: 12345678
          edpm_ovn_metadata_agent_DEFAULT_bind_host: 127.0.0.1
-         ctlplane_dns_nameservers:
-         - 192.168.111.1
-         dns_search_domains: []
          edpm_ovn_dbs:
-         - 192.168.111.1
+         - 192.168.122.1
          registry_url: quay.io/podified-antelope-centos9
          image_tag: current-podified
          edpm_ovn_controller_agent_image: "{{ registry_url }}/openstack-ovn-controller:{{ image_tag }}"
@@ -147,6 +85,6 @@ spec:
          enable_debug: false
          # edpm firewall, change the allowed CIDR if needed
          edpm_sshd_configure_firewall: true
-         edpm_sshd_allowed_ranges: ['192.168.111.0/24']
+         edpm_sshd_allowed_ranges: ['192.168.122.0/24']
          # SELinux module
          edpm_selinux_mode: enforcing