diff --git a/src/tests/bundles/bionic-train-ha-ovn.yaml b/src/tests/bundles/bionic-train-ha-ovn.yaml
index aa9cbddc..9a0c05ec 100644
--- a/src/tests/bundles/bionic-train-ha-ovn.yaml
+++ b/src/tests/bundles/bionic-train-ha-ovn.yaml
@@ -59,8 +59,12 @@ relations:
   - vault:certificates
 - - ovn-chassis:nova-compute
   - nova-compute:neutron-plugin
-- - ovn-chassis:ovsdb-subordinate
+- - ovn-chassis-octavia:ovsdb-subordinate
   - octavia:ovsdb-subordinate
+- - ovn-chassis-octavia:certificates
+  - vault:certificates
+- - ovn-chassis-octavia:ovsdb
+  - ovn-central:ovsdb
 - - ovn-central:ovsdb-cms
   - octavia:ovsdb-cms
 - - ovn-chassis:certificates
@@ -127,6 +131,8 @@ applications:
   hacluster-octavia:
     series: bionic
     charm: cs:~openstack-charmers-next/hacluster
+  ovn-chassis-octavia:
+    charm: cs:~openstack-charmers-next/ovn-chassis
   octavia:
     constraints: cores=8
     series: bionic
diff --git a/src/tests/bundles/bionic-ussuri-ha-ovn.yaml b/src/tests/bundles/bionic-ussuri-ha-ovn.yaml
index 32cf7a71..03d1f3bf 100644
--- a/src/tests/bundles/bionic-ussuri-ha-ovn.yaml
+++ b/src/tests/bundles/bionic-ussuri-ha-ovn.yaml
@@ -59,8 +59,12 @@ relations:
   - vault:certificates
 - - ovn-chassis:nova-compute
   - nova-compute:neutron-plugin
-- - ovn-chassis:ovsdb-subordinate
+- - ovn-chassis-octavia:ovsdb-subordinate
   - octavia:ovsdb-subordinate
+- - ovn-chassis-octavia:certificates
+  - vault:certificates
+- - ovn-chassis-octavia:ovsdb
+  - ovn-central:ovsdb
 - - ovn-central:ovsdb-cms
   - octavia:ovsdb-cms
 - - ovn-chassis:certificates
@@ -126,6 +130,8 @@ applications:
   hacluster-octavia:
     series: bionic
     charm: cs:~openstack-charmers-next/hacluster
+  ovn-chassis-octavia:
+    charm: cs:~openstack-charmers-next/ovn-chassis
   octavia:
     constraints: cores=8
     series: bionic
diff --git a/src/tests/bundles/focal-ussuri-ha-ovn.yaml b/src/tests/bundles/focal-ussuri-ha-ovn.yaml
index 6fdbea02..e1b72e4a 100644
--- a/src/tests/bundles/focal-ussuri-ha-ovn.yaml
+++ b/src/tests/bundles/focal-ussuri-ha-ovn.yaml
@@ -59,8 +59,12 @@ relations:
   - vault:certificates
 - - ovn-chassis:nova-compute
   - nova-compute:neutron-plugin
-- - ovn-chassis:ovsdb-subordinate
+- - ovn-chassis-octavia:ovsdb-subordinate
   - octavia:ovsdb-subordinate
+- - ovn-chassis-octavia:certificates
+  - vault:certificates
+- - ovn-chassis-octavia:ovsdb
+  - ovn-central:ovsdb
 - - ovn-central:ovsdb-cms
   - octavia:ovsdb-cms
 - - ovn-chassis:certificates
@@ -147,6 +151,8 @@ applications:
   hacluster-octavia:
     series: focal
     charm: cs:~openstack-charmers-next/hacluster
+  ovn-chassis-octavia:
+    charm: cs:~openstack-charmers-next/ovn-chassis
   octavia:
     constraints: cores=8
     series: focal
diff --git a/src/tests/bundles/focal-victoria-ha-ovn.yaml b/src/tests/bundles/focal-victoria-ha-ovn.yaml
index 58d4323d..ac98cdb7 100644
--- a/src/tests/bundles/focal-victoria-ha-ovn.yaml
+++ b/src/tests/bundles/focal-victoria-ha-ovn.yaml
@@ -59,8 +59,12 @@ relations:
   - vault:certificates
 - - ovn-chassis:nova-compute
   - nova-compute:neutron-plugin
-- - ovn-chassis:ovsdb-subordinate
+- - ovn-chassis-octavia:ovsdb-subordinate
   - octavia:ovsdb-subordinate
+- - ovn-chassis-octavia:certificates
+  - vault:certificates
+- - ovn-chassis-octavia:ovsdb
+  - ovn-central:ovsdb
 - - ovn-central:ovsdb-cms
   - octavia:ovsdb-cms
 - - ovn-chassis:certificates
@@ -147,6 +151,8 @@ applications:
   hacluster-octavia:
     series: focal
     charm: cs:~openstack-charmers-next/hacluster
+  ovn-chassis-octavia:
+    charm: cs:~openstack-charmers-next/ovn-chassis
   octavia:
     constraints: cores=8
     series: focal
diff --git a/src/tests/bundles/groovy-victoria-ha-ovn.yaml b/src/tests/bundles/groovy-victoria-ha-ovn.yaml
index a751f9b6..25f9d317 100644
--- a/src/tests/bundles/groovy-victoria-ha-ovn.yaml
+++ b/src/tests/bundles/groovy-victoria-ha-ovn.yaml
@@ -59,8 +59,12 @@ relations:
   - vault:certificates
 - - ovn-chassis:nova-compute
   - nova-compute:neutron-plugin
-- - ovn-chassis:ovsdb-subordinate
+- - ovn-chassis-octavia:ovsdb-subordinate
   - octavia:ovsdb-subordinate
+- - ovn-chassis-octavia:certificates
+  - vault:certificates
+- - ovn-chassis-octavia:ovsdb
+  - ovn-central:ovsdb
 - - ovn-central:ovsdb-cms
   - octavia:ovsdb-cms
 - - ovn-chassis:certificates
@@ -147,6 +151,8 @@ applications:
   hacluster-octavia:
     series: groovy
     charm: cs:~openstack-charmers-next/hacluster
+  ovn-chassis-octavia:
+    charm: cs:~openstack-charmers-next/ovn-chassis
   octavia:
     constraints: cores=8
     series: groovy
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 127b3955..5890bf5a 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -41,6 +41,9 @@ target_deploy_status:
   ovn-chassis:
     workload-status: waiting
     workload-status-message: "'certificates' awaiting server certificate data"
+  ovn-chassis-octavia:
+    workload-status: waiting
+    workload-status-message: "'certificates' awaiting server certificate data"
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize
 - zaza.openstack.charm_tests.glance_simplestreams_sync.setup.sync_images