diff --git a/src/metadata.yaml b/src/metadata.yaml
index 620c2e3..33f64c5 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -7,6 +7,7 @@ tags:
   - openstack
 series:
   - bionic
+  - cosmic
 subordinate: true
 requires:
   dashboard:
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
index 64dfc0a..00d1b40 100644
--- a/src/tests/bundles/bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@@ -20,8 +20,8 @@ relations:
   - octavia:amqp
 - - rabbitmq-server:amqp
   - neutron-openvswitch:amqp
-- - neutron-openvswitch:juju-info
-  - octavia:juju-info
+- - neutron-openvswitch:neutron-plugin
+  - octavia:neutron-openvswitch
 - - openstack-dashboard:dashboard-plugin
   - octavia-dashboard:dashboard
 applications:
@@ -55,7 +55,7 @@ applications:
      charm: cs:~openstack-charmers-next/openstack-dashboard
      num_units: 1
      options:
-       openstack-origin: cloud:bionic-rocky/proposed
+       openstack-origin: cloud:bionic-rocky
   octavia-dashboard:
      series: bionic
      charm: ../../../octavia-dashboard
diff --git a/src/tests/bundles/cosmic-rocky.yaml b/src/tests/bundles/cosmic-rocky.yaml
new file mode 100644
index 0000000..d916560
--- /dev/null
+++ b/src/tests/bundles/cosmic-rocky.yaml
@@ -0,0 +1,54 @@
+series: cosmic
+relations:
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - neutron-api:shared-db
+- - mysql:shared-db
+  - octavia:shared-db
+- - mysql:shared-db
+  - openstack-dashboard:shared-db
+- - keystone:identity-service
+  - neutron-api:identity-service
+- - keystone:identity-service
+  - octavia:identity-service
+- - keystone:identity-service
+  - openstack-dashboard:identity-service
+- - rabbitmq-server:amqp
+  - neutron-api:amqp
+- - rabbitmq-server:amqp
+  - octavia:amqp
+- - rabbitmq-server:amqp
+  - neutron-openvswitch:amqp
+- - neutron-openvswitch:neutron-plugin
+  - octavia:neutron-openvswitch
+- - openstack-dashboard:dashboard-plugin
+  - octavia-dashboard:dashboard
+applications:
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+  mysql:
+    constraints: mem=3072M
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      neutron-security-groups: True
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+  octavia:
+    charm: cs:~openstack-charmers-next/octavia
+    num_units: 1
+  openstack-dashboard:
+     charm: cs:~openstack-charmers-next/openstack-dashboard
+     num_units: 1
+  octavia-dashboard:
+     series: cosmic
+     charm: ../../../octavia-dashboard
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 30cc12d..4537c05 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,9 +1,16 @@
 charm_name: octavia-dashboard
 gate_bundles:
 - bionic-rocky
-- cosmic-rocky
 smoke_bundles:
 - bionic-rocky
+comment: |
+  Disable ``cosmic-rocky`` bundle pending SRU of ``octavia-dashboard`` package.
+dev_bundles:
+- cosmic-rocky
+target_deploy_status:
+  octavia:
+    workload-status: blocked
+    workload-status-message: Awaiting
 configure:
 - zaza.charm_tests.noop.setup.basic_setup
 tests: