diff --git a/roles/debian_hypervisor/files/ovs-vswitchd_override.conf b/roles/debian_hypervisor/files/ovs-vswitchd_override.conf
deleted file mode 100644
index 11fdc19e3..000000000
--- a/roles/debian_hypervisor/files/ovs-vswitchd_override.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Slice=ovs.slice
diff --git a/roles/debian_hypervisor/files/team0_x@.service b/roles/debian_hypervisor/files/team0_x@.service
new file mode 100644
index 000000000..fb8fceed6
--- /dev/null
+++ b/roles/debian_hypervisor/files/team0_x@.service
@@ -0,0 +1,20 @@
+# Systemd unit wrapping around team0_* ports.
+# This can be used to synchronize ports link state with the service that use
+# them.
+
+[Unit]
+After=network.target
+DefaultDependencies=false
+Conflicts=shutdown.target
+Before=shutdown.target
+StopWhenUnneeded=true
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=networkctl up %i
+ExecStop=networkctl down %i
+
+[Install]
+# empty: This unit must be activated via Wants/Requires of other units that need
+# it
diff --git a/roles/debian_hypervisor/tasks/main.yml b/roles/debian_hypervisor/tasks/main.yml
index 88567ff01..4a3a499c1 100644
--- a/roles/debian_hypervisor/tasks/main.yml
+++ b/roles/debian_hypervisor/tasks/main.yml
@@ -202,17 +202,25 @@
     owner: root
     group: root
     mode: 0755
-- name: Copy ovs-vswitchd.service drop-in
-  ansible.builtin.copy:
-    src: ovs-vswitchd_override.conf
+- name: Create ovs-vswitchd.service drop-in
+  template:
+    src: ovs-vswitchd_override.conf.j2
     dest: /etc/systemd/system/ovs-vswitchd.service.d/override.conf
     owner: root
     group: root
     mode: 0644
   register: ovsvswitchd
+- name: Copy team0_x@.service file
+  ansible.builtin.copy:
+    src: team0_x@.service
+    dest: /etc/systemd/system/team0_x@.service
+    owner: root
+    group: root
+    mode: 0644
+  register: team0_x_service
 - name: Restart ovs-vswitchd
   ansible.builtin.systemd:
     state: restarted
     daemon_reload: yes
     name: ovs-vswitchd
-  when: ovsvswitchd.changed
+  when: ovsvswitchd.changed or team0_x_service.changed
diff --git a/roles/debian_hypervisor/templates/ovs-vswitchd_override.conf.j2 b/roles/debian_hypervisor/templates/ovs-vswitchd_override.conf.j2
new file mode 100644
index 000000000..bf480c5e0
--- /dev/null
+++ b/roles/debian_hypervisor/templates/ovs-vswitchd_override.conf.j2
@@ -0,0 +1,6 @@
+[Service]
+Slice=ovs.slice
+
+[Unit]
+Requires=team0_x@{{team0_0}}.service
+Requires=team0_x@{{team0_1}}.service
diff --git a/roles/deploy_cukinia/files/cukinia b/roles/deploy_cukinia/files/cukinia
index de85359bb..29ca6077f 160000
--- a/roles/deploy_cukinia/files/cukinia
+++ b/roles/deploy_cukinia/files/cukinia
@@ -1 +1 @@
-Subproject commit de85359bbb8cd3f587d084b66d3d8f69a5971cde
+Subproject commit 29ca6077f71f2a49de80a4b4b38fb6aa50197c07
diff --git a/roles/deploy_cukinia_tests/cukinia-tests b/roles/deploy_cukinia_tests/cukinia-tests
index ac714c47e..3cd9b6b7a 160000
--- a/roles/deploy_cukinia_tests/cukinia-tests
+++ b/roles/deploy_cukinia_tests/cukinia-tests
@@ -1 +1 @@
-Subproject commit ac714c47eeb220b443dd8ffd2d2dad435bbc5352
+Subproject commit 3cd9b6b7ad0a1e1bf66789d867e7e42f597ee23c
diff --git a/roles/deploy_vm_manager/files/vm_manager b/roles/deploy_vm_manager/files/vm_manager
index 65c61c2cd..dc7d106c0 160000
--- a/roles/deploy_vm_manager/files/vm_manager
+++ b/roles/deploy_vm_manager/files/vm_manager
@@ -1 +1 @@
-Subproject commit 65c61c2cdf513e4551ab41c436ebfa532a1b8c92
+Subproject commit dc7d106c011b0458982a2ba3c6b38d26f9046b16
diff --git a/roles/network_networkdwait/README.md b/roles/network_networkdwait/README.md
index 6e5de176e..52b3bb8b1 100644
--- a/roles/network_networkdwait/README.md
+++ b/roles/network_networkdwait/README.md
@@ -8,7 +8,11 @@ no requirement.
 
 ## Role Variables
 
-no variables.
+- cluster_ip_addr
+- cluster_protocol
+- interfaces_to_wait_for
+- team0_0
+- team0_1
 
 ## Example Playbook