diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index 8795e80227..f708a3e92c 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.3.34
+version: 0.3.35
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
index c7f13c104e..1ee084bcd2 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
@@ -428,7 +428,7 @@ do
   bridge=${bmap%:*}
   iface=${bmap#*:}
   ovs-vsctl --no-wait --may-exist add-br $bridge
-  if [ -n "$iface" ] && [ "$iface" != "null" ]
+  if [ -n "$iface" ] && [ "$iface" != "null" ] && ( ip link show $iface 1>/dev/null 2>&1 );
   then
     ovs-vsctl --no-wait --may-exist add-port $bridge $iface
     migrate_ip_from_nic $iface $bridge
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 1ac4a2f07b..fcc6810915 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -76,4 +76,5 @@ neutron:
   - 0.3.32 Update dpdk override
   - 0.3.33 Make sure trust on command is applied to avoid race-condition with ovs-dpdk
   - 0.3.34 Update metadata endpoint
+  - 0.3.35 Do not attach non-existing interfaces to br-ex bridge for OVS agent
 ...
diff --git a/tools/deployment/component/compute-kit/compute-kit.sh b/tools/deployment/component/compute-kit/compute-kit.sh
index d55beb6cba..a1207cdb8e 100755
--- a/tools/deployment/component/compute-kit/compute-kit.sh
+++ b/tools/deployment/component/compute-kit/compute-kit.sh
@@ -78,6 +78,10 @@ conf:
       max_l3_agents_per_router: 1
       l3_ha_network_type: vxlan
       dhcp_agents_per_network: 1
+  # provider1 is a tap interface used by default in the test env
+  # we create this interface while setting up the test env
+  auto_bridge_add:
+    br-ex: provider1
   plugins:
     ml2_conf:
       ml2_type_flat:
diff --git a/tools/deployment/component/heat/heat.sh b/tools/deployment/component/heat/heat.sh
index 43a670d305..6ee2995926 100755
--- a/tools/deployment/component/heat/heat.sh
+++ b/tools/deployment/component/heat/heat.sh
@@ -35,7 +35,7 @@ openstack service list
 openstack endpoint list
 sleep 30 #NOTE(portdirect): Wait for ingress controller to update rules and restart Nginx
 
-openstack --os-interface internal orchestration service list
+openstack orchestration service list
 
 FEATURE_GATE="tls"; if [[ ${FEATURE_GATES//,/ } =~ (^|[[:space:]])${FEATURE_GATE}($|[[:space:]]) ]]; then
   curl --cacert /etc/openstack-helm/certs/ca/ca.pem -L https://heat.openstack.svc.cluster.local
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 1b136d0b72..330bf218fa 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -20,6 +20,12 @@
       - name: primary
         nodes:
           - primary
+      - name: k8s_cluster
+        nodes:
+          - primary
+      - name: k8s_control_plane
+        nodes:
+          - primary
 
 - nodeset:
     name: openstack-helm-3nodes-ubuntu_focal
@@ -38,6 +44,18 @@
         nodes:
           - node-1
           - node-2
+      - name: k8s_cluster
+        nodes:
+          - primary
+          - node-1
+          - node-2
+      - name: k8s_control_plane
+        nodes:
+          - primary
+      - name: k8s_nodes
+        nodes:
+          - node-1
+          - node-2
 
 - nodeset:
     name: openstack-helm-1node-32GB-ubuntu_focal
@@ -51,6 +69,12 @@
       - name: primary
         nodes:
           - primary
+      - name: k8s_cluster
+        nodes:
+          - primary
+      - name: k8s_control_plane
+        nodes:
+          - primary
 
 - nodeset:
     name: openstack-helm-1node-ubuntu_jammy
@@ -61,6 +85,12 @@
       - name: primary
         nodes:
           - primary
+      - name: k8s_cluster
+        nodes:
+          - primary
+      - name: k8s_control_plane
+        nodes:
+          - primary
 
 - nodeset:
     name: openstack-helm-3nodes-ubuntu_jammy
@@ -79,6 +109,42 @@
         nodes:
           - node-1
           - node-2
+      - name: k8s_cluster
+        nodes:
+          - primary
+          - node-1
+          - node-2
+      - name: k8s_control_plane
+        nodes:
+          - primary
+      - name: k8s_nodes
+        nodes:
+          - node-1
+          - node-2
+
+- nodeset:
+    name: openstack-helm-1node-2nodes-ubuntu_jammy
+    nodes:
+      - name: primary
+        label: ubuntu-jammy
+      - name: node-1
+        label: ubuntu-jammy
+      - name: node-2
+        label: ubuntu-jammy
+    groups:
+      - name: primary
+        nodes:
+          - primary
+      - name: k8s_cluster
+        nodes:
+          - node-1
+          - node-2
+      - name: k8s_control_plane
+        nodes:
+          - node-1
+      - name: k8s_nodes
+        nodes:
+          - node-2
 
 - nodeset:
     name: openstack-helm-1node-32GB-ubuntu_jammy
@@ -92,3 +158,9 @@
       - name: primary
         nodes:
           - primary
+      - name: k8s_cluster
+        nodes:
+          - primary
+      - name: k8s_control_plane
+        nodes:
+          - primary