diff --git a/zuul.d/base-nested-switch.yaml b/zuul.d/base-nested-switch.yaml
index 959b5ed..dcc0175 100644
--- a/zuul.d/base-nested-switch.yaml
+++ b/zuul.d/base-nested-switch.yaml
@@ -8,38 +8,12 @@
         nodes:
           - controller
 
-- nodeset:
-    name: neutron-nested-virt-ubuntu-jammy
-    nodes:
-      - name: controller
-        label: nested-virt-ubuntu-jammy
-    groups:
-      - name: tempest
-        nodes:
-          - controller
-
-# Base nested switch job for 2023.1 and later
+# Base nested switch job for non EM releases
 - job:
     name: neutron-tempest-plugin-base-nested-switch
     parent: neutron-tempest-plugin-base
     abstract: true
-    branches: ^(?!stable/(queens|rocky|stein|train|ussuri|victoria|wallaby|xena|yoga|zed)).*$
-    # Comment nodeset and vars to switch back to non nested nodes
-    nodeset: neutron-nested-virt-ubuntu-jammy
-    vars:
-      devstack_localrc:
-        LIBVIRT_TYPE: kvm
-        LIBVIRT_CPU_MODE: host-passthrough
-        CIRROS_VERSION: 0.5.2
-        DEFAULT_IMAGE_NAME: cirros-0.5.2-x86_64-disk
-        DEFAULT_IMAGE_FILE_NAME: cirros-0.5.2-x86_64-disk.img
-
-# Base nested switch job for victoria through zed
-- job:
-    name: neutron-tempest-plugin-base-nested-switch
-    parent: neutron-tempest-plugin-base
-    abstract: true
-    branches: ^stable/(victoria|wallaby|xena|yoga|zed)$
+    branches: ^(?!stable/(queens|rocky|stein|train|ussuri)).*$
     # Comment nodeset and vars to switch back to non nested nodes
     nodeset: neutron-nested-virt-ubuntu-focal
     vars:
@@ -55,4 +29,4 @@
     name: neutron-tempest-plugin-scenario-nested-switch
     parent: neutron-tempest-plugin-base
     abstract: true
-    branches: ^stable/(queens|rocky|stein|train|ussuri)$
+    branches: ^(stable/(queens|rocky|stein|train|ussuri)).*$
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index 8f4d1aa..a3c07c0 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -93,7 +93,6 @@
     name: neutron-tempest-plugin-scenario-openvswitch-wallaby
     parent: neutron-tempest-plugin-openvswitch
     override-checkout: stable/wallaby
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/wallaby
       tempest_test_regex: "\
@@ -114,7 +113,6 @@
     name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-wallaby
     parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
     override-checkout: stable/wallaby
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/wallaby
       tempest_test_regex: "\
@@ -135,7 +133,6 @@
     name: neutron-tempest-plugin-scenario-linuxbridge-wallaby
     parent: neutron-tempest-plugin-linuxbridge
     override-checkout: stable/wallaby
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/wallaby
       tempest_test_regex: "\
@@ -156,7 +153,6 @@
     name: neutron-tempest-plugin-scenario-ovn-wallaby
     parent: neutron-tempest-plugin-ovn
     override-checkout: stable/wallaby
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/wallaby
       tempest_test_regex: "\
@@ -184,7 +180,6 @@
     name: neutron-tempest-plugin-designate-scenario-wallaby
     parent: neutron-tempest-plugin-designate-scenario
     override-checkout: stable/wallaby
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/wallaby
       network_api_extensions_common: *api_extensions
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index a5b3d14..e0a58a7 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -95,7 +95,6 @@
     name: neutron-tempest-plugin-scenario-openvswitch-xena
     parent: neutron-tempest-plugin-openvswitch
     override-checkout: stable/xena
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/xena
       tempest_test_regex: "\
@@ -116,7 +115,6 @@
     name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-xena
     parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
     override-checkout: stable/xena
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/xena
       tempest_test_regex: "\
@@ -137,7 +135,6 @@
     name: neutron-tempest-plugin-scenario-linuxbridge-xena
     parent: neutron-tempest-plugin-linuxbridge
     override-checkout: stable/xena
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/xena
       tempest_test_regex: "\
@@ -158,7 +155,6 @@
     name: neutron-tempest-plugin-scenario-ovn-xena
     parent: neutron-tempest-plugin-ovn
     override-checkout: stable/xena
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/xena
       tempest_test_regex: "\
@@ -186,7 +182,6 @@
     name: neutron-tempest-plugin-designate-scenario-xena
     parent: neutron-tempest-plugin-designate-scenario
     override-checkout: stable/xena
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/xena
       network_api_extensions_common: *api_extensions
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 06bbd4e..bc88c83 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -97,7 +97,6 @@
     name: neutron-tempest-plugin-scenario-openvswitch-yoga
     parent: neutron-tempest-plugin-openvswitch
     override-checkout: stable/yoga
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/yoga
       tempest_test_regex: "\
@@ -118,7 +117,6 @@
     name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-yoga
     parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
     override-checkout: stable/yoga
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/yoga
       tempest_test_regex: "\
@@ -139,7 +137,6 @@
     name: neutron-tempest-plugin-scenario-linuxbridge-yoga
     parent: neutron-tempest-plugin-linuxbridge
     override-checkout: stable/yoga
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/yoga
       tempest_test_regex: "\
@@ -160,7 +157,6 @@
     name: neutron-tempest-plugin-scenario-ovn-yoga
     parent: neutron-tempest-plugin-ovn
     override-checkout: stable/yoga
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/yoga
       tempest_test_regex: "\
@@ -190,7 +186,6 @@
     name: neutron-tempest-plugin-designate-scenario-yoga
     parent: neutron-tempest-plugin-designate-scenario
     override-checkout: stable/yoga
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/yoga
       network_api_extensions_common: *api_extensions
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index 2178737..097df53 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -2,7 +2,6 @@
     name: neutron-tempest-plugin-openvswitch-zed
     parent: neutron-tempest-plugin-openvswitch
     override-checkout: stable/zed
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/zed
       network_api_extensions_openvswitch:
@@ -109,7 +108,6 @@
     name: neutron-tempest-plugin-openvswitch-iptables_hybrid-zed
     parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
     override-checkout: stable/zed
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/zed
       network_api_extensions_openvswitch:
@@ -140,7 +138,6 @@
     name: neutron-tempest-plugin-linuxbridge-zed
     parent: neutron-tempest-plugin-linuxbridge
     override-checkout: stable/zed
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/zed
       network_api_extensions_linuxbridge:
@@ -167,7 +164,6 @@
     name: neutron-tempest-plugin-ovn-zed
     parent: neutron-tempest-plugin-ovn
     override-checkout: stable/zed
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/zed
       tempest_test_regex: "\
@@ -200,7 +196,6 @@
     name: neutron-tempest-plugin-designate-scenario-zed
     parent: neutron-tempest-plugin-designate-scenario
     override-checkout: stable/zed
-    nodeset: neutron-nested-virt-ubuntu-focal
     vars:
       branch_override: stable/zed
       network_api_extensions_common: *api_extensions