diff --git a/ci/common/ironic_standalone_post.yaml b/ci/common/ironic_standalone_post.yaml
index 772e52908e..75ea1c7eb8 100644
--- a/ci/common/ironic_standalone_post.yaml
+++ b/ci/common/ironic_standalone_post.yaml
@@ -14,6 +14,7 @@ resources:
     type: ../../extraconfig/post_deploy/standalone_post.yaml
     properties:
        servers:  {get_param: servers}
+       EndpointMap:  {get_param: EndpointMap}
 
   IronicVBMCSetup:
     type: vbmc_setup.yaml
diff --git a/ci/common/vbmc_setup.yaml b/ci/common/vbmc_setup.yaml
index f52821b4ca..e1989aec0d 100644
--- a/ci/common/vbmc_setup.yaml
+++ b/ci/common/vbmc_setup.yaml
@@ -23,7 +23,7 @@ resources:
         yum install -y python2-virtualbmc epel-release libvirt-client libvirt-daemon libvirt qemu-kvm-ev
         yum install -y qemu-system-x86  # <-- needs epel
         yum remove -y epel-release
-        systemctl start libvirtd
+        systemctl start libvirtd virtualbmc
         git clone https://opendev.org/openstack/ironic /tmp/ironic
         mkdir -p /var/log/bmlogs
         chmod 777 /var/log/bmlogs
@@ -48,6 +48,11 @@ resources:
         nohup /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node1 -c 1 -m 3072 -d 10 -b br-ex -p 1161 -M 1350 -f qcow2 -a x86_64 -E qemu -e /usr/bin/qemu-system-x86_64 -l /var/log/bmlogs -A 66:0d:1d:d8:0b:11 > ~zuul/create-node-1.log 2>&1 < /dev/null
         nohup /tmp/ironic/devstack/tools/ironic/scripts/create-node.sh -n node2 -c 1 -m 3072 -d 10 -b br-ex -p 1162 -M 1350 -f qcow2 -a x86_64 -E qemu -e /usr/bin/qemu-system-x86_64 -l /var/log/bmlogs -A 66:0d:1d:d8:0b:22 > ~zuul/create-node-2.log 2>&1 < /dev/null &
 
+        vbmc --no-daemon add node1 --port 1161
+        vbmc --no-daemon start node1
+        vbmc --no-daemon add node2 --port 1162
+        vbmc --no-daemon start node2
+
         disown -a
   ExtraDeployments:
     type: OS::Heat::SoftwareDeploymentGroup
diff --git a/ci/environments/scenario012-standalone.yaml b/ci/environments/scenario012-standalone.yaml
index a8f0c4818a..7099c5d41a 100644
--- a/ci/environments/scenario012-standalone.yaml
+++ b/ci/environments/scenario012-standalone.yaml
@@ -19,6 +19,7 @@ resource_registry:
   OS::TripleO::NodeExtraConfigPost: ../common/ironic_standalone_post.yaml
   OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible
+  OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml
   OS::TripleO::Services::NovaCompute: OS::Heat::None
   OS::TripleO::Services::NovaLibvirt: OS::Heat::None
 
@@ -29,14 +30,14 @@ parameter_defaults:
   SwiftCeilometerPipelineEnabled: false
   IronicCleaningDiskErase: 'metadata'
   NovaSchedulerDiscoverHostsInCellsInterval: 15
-  NeutronMechanismDrivers: openvswitch,ansible
+  NeutronMechanismDrivers: ovn,ansible
   NeutronNetworkType: vlan
-  NeutronTypeDrivers: local,vxlan,vlan,flat
+  NeutronTypeDrivers: local,geneve,vlan,flat
   IronicDefaultNetworkInterface: neutron
   IronicAutomatedClean: false
   NeutronFlatNetworks: datacentre
   NeutronNetworkVLANRanges: 'datacentre:500:599,tenant:300:399'
   ML2HostConfigs: { "net-ans-br": { "ansible_network_os": "openvswitch", "ansible_host": "127.0.0.1", "ansible_user": "root", "ansible_ssh_private_key_file": "/etc/puppet/ci-key"}}
   NeutronBridgeMappings: 'datacentre:br-ex,tenant:br-tenant'
-  # Remove ContainerCli once this scenario is tested on CentOS8
+  # Remove ContainerCli once this scenario is tested on CentOS8.
   ContainerCli: docker