diff --git a/metadata.yaml b/metadata.yaml
index 7e1a7b1d..1fa0fa10 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -20,6 +20,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
   - trusty
 extra-bindings:
   data:
diff --git a/tests/bundles/bionic_queens.yaml b/tests/bundles/bionic-queens.yaml
similarity index 100%
rename from tests/bundles/bionic_queens.yaml
rename to tests/bundles/bionic-queens.yaml
diff --git a/tests/bundles/bionic_rocky.yaml b/tests/bundles/bionic-rocky.yaml
similarity index 100%
rename from tests/bundles/bionic_rocky.yaml
rename to tests/bundles/bionic-rocky.yaml
diff --git a/tests/bundles/bionic_stein.yaml b/tests/bundles/bionic-stein.yaml
similarity index 100%
rename from tests/bundles/bionic_stein.yaml
rename to tests/bundles/bionic-stein.yaml
diff --git a/tests/bundles/bionic_train.yaml b/tests/bundles/bionic-train.yaml
similarity index 97%
rename from tests/bundles/bionic_train.yaml
rename to tests/bundles/bionic-train.yaml
index 3233a0e1..84613d5f 100644
--- a/tests/bundles/bionic_train.yaml
+++ b/tests/bundles/bionic-train.yaml
@@ -60,7 +60,7 @@ applications:
     to:
     - '0'
   placement:
-    charm: cs:~openstack-charmers/bionic/placement
+    charm: cs:~openstack-charmers-next/bionic/placement
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml
new file mode 100644
index 00000000..295fb456
--- /dev/null
+++ b/tests/bundles/bionic-ussuri.yaml
@@ -0,0 +1,115 @@
+series: bionic
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+
+applications:
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '1'
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '2'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+    - '3'
+  keystone:
+    num_units: 1
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '4'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '5'
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '6'
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+    - '0'
+  placement:
+    charm: cs:~openstack-charmers-next/bionic/placement
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '7'
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+
+relations:
+- - 'neutron-openvswitch:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'neutron-openvswitch:neutron-plugin'
+  - 'nova-compute:neutron-plugin'
+- - 'neutron-openvswitch:neutron-plugin-api'
+  - 'neutron-api:neutron-plugin-api'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'nova-compute:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'nova-compute:image-service'
+  - 'glance:image-service'
+- - 'glance:identity-service'
+  - 'keystone:identity-service'
+- - 'glance:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'glance:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'keystone:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'nova-cloud-controller:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'nova-cloud-controller:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'nova-cloud-controller:identity-service'
+  - 'keystone:identity-service'
+- - 'nova-cloud-controller:cloud-compute'
+  - 'nova-compute:cloud-compute'
+- - 'nova-cloud-controller:image-service'
+  - 'glance:image-service'
+- - 'placement:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'placement:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'placement:placement'
+  - 'nova-cloud-controller:placement'
+- - 'placement:identity-service'
+  - 'keystone:identity-service'
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
new file mode 100644
index 00000000..d7350c49
--- /dev/null
+++ b/tests/bundles/focal-ussuri.yaml
@@ -0,0 +1,180 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: focal
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+  '8':
+  '9':
+
+applications:
+
+  neutron-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  placement-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '3'
+
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+    to:
+    - '4'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+    - '5'
+
+  keystone:
+    num_units: 1
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '7'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '8'
+
+  placement:
+    charm: cs:~openstack-charmers-next/bionic/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '9'
+
+  neutron-openvswitch:
+    charm: ../../../neutron-openvswitch
+
+relations:
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-openvswitch:neutron-plugin'
+    - 'nova-compute:neutron-plugin'
+
+  - - 'neutron-openvswitch:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:shared-db'
+    - 'nova-cloud-controller-mysql-router:shared-db'
+  - - 'nova-cloud-controller-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'placement:shared-db'
+    - 'placement-mysql-router:shared-db'
+  - - 'placement-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'placement:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
diff --git a/tests/bundles/trusty_mitaka.yaml b/tests/bundles/trusty-mitaka.yaml
similarity index 100%
rename from tests/bundles/trusty_mitaka.yaml
rename to tests/bundles/trusty-mitaka.yaml
diff --git a/tests/bundles/xenial_mitaka.yaml b/tests/bundles/xenial-mitaka.yaml
similarity index 100%
rename from tests/bundles/xenial_mitaka.yaml
rename to tests/bundles/xenial-mitaka.yaml
diff --git a/tests/bundles/xenial_ocata.yaml b/tests/bundles/xenial-ocata.yaml
similarity index 100%
rename from tests/bundles/xenial_ocata.yaml
rename to tests/bundles/xenial-ocata.yaml
diff --git a/tests/bundles/xenial_pike.yaml b/tests/bundles/xenial-pike.yaml
similarity index 100%
rename from tests/bundles/xenial_pike.yaml
rename to tests/bundles/xenial-pike.yaml
diff --git a/tests/bundles/xenial_queens.yaml b/tests/bundles/xenial-queens.yaml
similarity index 100%
rename from tests/bundles/xenial_queens.yaml
rename to tests/bundles/xenial-queens.yaml
diff --git a/tests/tests.yaml b/tests/tests.yaml
index d7a703ff..264eee4e 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,20 +1,25 @@
 charm_name: neutron-openvswitch
 
 smoke_bundles:
-  - bionic_train
+  - bionic-ussuri
 
 gate_bundles:
-  - xenial_mitaka
-  - xenial_ocata
-  - xenial_pike
-  - xenial_queens
-  - bionic_queens
-  - bionic_rocky
-  - bionic_stein
-  - bionic_train
+  - xenial-mitaka
+  - xenial-ocata
+  - xenial-pike
+  - xenial-queens
+  - bionic-queens
+  - bionic-rocky
+  - bionic-stein
+  - bionic-train
+  - bionic-ussuri
+  - focal-ussuri
 
 dev_bundles:
-  - bionic_train
+  - focal-ussuri
 
 tests:
   - zaza.openstack.charm_tests.neutron.tests.NeutronOpenvSwitchTest
+tests_options:
+  force_deploy:
+    - focal-ussuri