diff --git a/playbooks/tripleo-ci/run-v3.yaml b/playbooks/tripleo-ci/run-v3.yaml
index b70755169..1053c5860 100644
--- a/playbooks/tripleo-ci/run-v3.yaml
+++ b/playbooks/tripleo-ci/run-v3.yaml
@@ -51,6 +51,9 @@
 
           export PYTHONUNBUFFERED=true
           export TRIPLEO_ROOT={{ ansible_user_dir  }}/workspace
+          # NOTE(trown) We can move this into the multinode environment file once we
+          # migrate the 2-node jobs over to zuulv3
+          export VXLAN_VARS="-e toci_vxlan_networking='false' -e vxlan_networking='false'"
 
           bash -xe $TRIPLEO_ROOT/tripleo-ci/toci_gate_test.sh
         executable: /bin/bash
diff --git a/toci_gate_test.sh b/toci_gate_test.sh
index 73370f908..82eb3701f 100755
--- a/toci_gate_test.sh
+++ b/toci_gate_test.sh
@@ -80,6 +80,7 @@ export CONTROLLER_HOSTS=
 export SUBNODES_SSH_KEY=
 TIMEOUT_SECS=$((DEVSTACK_GATE_TIMEOUT*60))
 export EXTRA_VARS=${EXTRA_VARS:-""}
+export VXLAN_VARS=${VXLAN_VARS:-""}
 export NODES_ARGS=""
 export EXTRANODE=""
 # Set playbook execution status
diff --git a/toci_quickstart.sh b/toci_quickstart.sh
index 63e0734e0..0949379ab 100755
--- a/toci_quickstart.sh
+++ b/toci_quickstart.sh
@@ -128,6 +128,7 @@ for playbook in $PLAYBOOKS; do
         $FEATURESET_CONF \
         $ENV_VARS \
         $EXTRA_VARS \
+        $VXLAN_VARS \
         $DEFAULT_ARGS \
         $LOCAL_WORKING_DIR/playbooks/$playbook ${PLAYBOOKS_ARGS[$playbook]:-}" \
         | sed  's/--/\n--/g' \
@@ -147,6 +148,7 @@ else
            $FEATURESET_CONF \
            $ENV_VARS \
            $EXTRA_VARS \
+           $VXLAN_VARS \
            $DEFAULT_ARGS \
            --extra-vars ci_job_end_time=$(( START_JOB_TIME + REMAINING_TIME*60 )) \
             $LOCAL_WORKING_DIR/playbooks/$playbook "${PLAYBOOKS_ARGS[$playbook]:-}" \
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 96e3b878c..9ec0284ca 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -19,5 +19,11 @@
 - nodeset:
     name: single-centos-7-node
     nodes:
-      - name: centos-7
+      - name: primary
         label: centos-7
+    groups:
+      - name: switch
+        nodes:
+          - primary
+      - name: peers
+        nodes: []
diff --git a/zuul.d/undercloud-jobs.yaml b/zuul.d/undercloud-jobs.yaml
index 03c8809a9..3d65a295a 100644
--- a/zuul.d/undercloud-jobs.yaml
+++ b/zuul.d/undercloud-jobs.yaml
@@ -19,43 +19,40 @@
 
 - job:
     name: tripleo-ci-centos-7-undercloud-containers
-    parent: tripleo-ci-dsvm
-    run: playbooks/tripleo-ci/run.yaml
+    parent: tripleo-ci-base
     post-run: playbooks/tripleo-ci/post.yaml
     timeout: 10800
-    nodeset: legacy-centos-7
+    nodeset: single-centos-7-node
     branches: ^(?!stable/(newton|ocata|pike|queens)).*$
     vars:
       toci_jobtype: singlenode-featureset027
 
 - job:
     name: tripleo-ci-centos-7-undercloud-oooq
-    parent: tripleo-ci-dsvm
-    run: playbooks/tripleo-ci/run.yaml
+    parent: tripleo-ci-base
     post-run: playbooks/tripleo-ci/post.yaml
     timeout: 10800
     voting: false
-    nodeset: legacy-centos-7
+    nodeset: single-centos-7-node
     vars:
       toci_jobtype: singlenode-featureset003
 
 - job:
     name: tripleo-ci-centos-7-undercloud-upgrades
-    parent: tripleo-ci-dsvm
-    run: playbooks/tripleo-ci/run.yaml
+    parent: tripleo-ci-base
     post-run: playbooks/tripleo-ci/post.yaml
     timeout: 10800
-    nodeset: legacy-centos-7
+    nodeset: single-centos-7-node
     branches: ^(?!stable/(newton|ocata)).*$
     vars:
       toci_jobtype: singlenode-featureset047
+
 - job:
     name: tripleo-ci-centos-7-containerized-undercloud-upgrades
-    parent: tripleo-ci-dsvm
-    run: playbooks/tripleo-ci/run.yaml
+    parent: tripleo-ci-base
     post-run: playbooks/tripleo-ci/post.yaml
     timeout: 10800
-    nodeset: legacy-centos-7
+    nodeset: single-centos-7-node
     branches: ^(?!stable/(newton|ocata|pike|queens)).*$
     vars:
       toci_jobtype: singlenode-featureset050