diff --git a/src/lib/charm/openstack/dragent.py b/src/lib/charm/openstack/dragent.py
index 611f5a5..9c3a091 100644
--- a/src/lib/charm/openstack/dragent.py
+++ b/src/lib/charm/openstack/dragent.py
@@ -119,6 +119,7 @@ class DRAgentCharm(charms_openstack.charm.OpenStackCharm):
             ('13', 'rocky'),
             ('14', 'stein'),
             ('15', 'train'),
+            ('16', 'ussuri'),
         ]),
     }
 
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 65892d4..46e9d9a 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -10,6 +10,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
 subordinate: false
 extra-bindings:
   # Used to specify the OpenStack provider network interface
diff --git a/src/tests/bundles/bionic-ussuri-functional.yaml b/src/tests/bundles/bionic-ussuri-functional.yaml
new file mode 100644
index 0000000..0b7e9b0
--- /dev/null
+++ b/src/tests/bundles/bionic-ussuri-functional.yaml
@@ -0,0 +1,55 @@
+relations:
+- [neutron-dynamic-routing, rabbitmq-server]
+- [neutron-dynamic-routing, quagga]
+- [keystone, mysql]
+- [neutron-api, mysql]
+- [neutron-api, rabbitmq-server]
+- [neutron-api, keystone]
+applications:
+  keystone:
+    charm: cs:~openstack-charmers-next/bionic/keystone
+    constraints: mem=1G
+    num_units: 1
+    options:
+      openstack-origin: 'cloud:bionic-ussuri'
+      haproxy-server-timeout: 90000
+      haproxy-client-timeout: 90000
+      haproxy-queue-timeout: 9000
+      haproxy-connect-timeout: 9000
+    series: bionic
+  mysql:
+    charm: cs:~openstack-charmers-next/bionic/percona-cluster
+    constraints: mem=4G
+    num_units: 1
+    options: {source: 'cloud:bionic-ussuri'}
+    series: bionic
+  neutron-api:
+    charm: cs:~openstack-charmers-next/bionic/neutron-api
+    constraints: mem=1G
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      neutron-plugin: ovs
+      flat-network-providers: physnet1,
+      neutron-security-groups: true
+      openstack-origin: 'cloud:bionic-ussuri'
+      haproxy-server-timeout: 90000
+      haproxy-client-timeout: 90000
+      haproxy-queue-timeout: 9000
+      haproxy-connect-timeout: 9000
+    series: bionic
+  neutron-dynamic-routing:
+    charm: ../../../neutron-dynamic-routing
+    num_units: 1
+    options: {openstack-origin: 'cloud:bionic-ussuri'}
+    series: bionic
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/bionic/rabbitmq-server
+    constraints: mem=1G
+    num_units: 1
+    options: {source: 'cloud:bionic-ussuri'}
+    series: bionic
+  quagga:
+    charm: cs:~openstack-charmers-next/bionic/quagga
+    num_units: 1
+    series: bionic
diff --git a/src/tests/bundles/focal-ussuri-functional.yaml b/src/tests/bundles/focal-ussuri-functional.yaml
new file mode 100644
index 0000000..6ce9368
--- /dev/null
+++ b/src/tests/bundles/focal-ussuri-functional.yaml
@@ -0,0 +1,113 @@
+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':
+    # for quagga which has no focal support yet
+    series: bionic
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      haproxy-server-timeout: 90000
+      haproxy-client-timeout: 90000
+      haproxy-queue-timeout: 9000
+      haproxy-connect-timeout: 9000
+    to:
+      - '3'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      neutron-plugin: ovs
+      flat-network-providers: physnet1,
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      haproxy-server-timeout: 90000
+      haproxy-client-timeout: 90000
+      haproxy-queue-timeout: 9000
+      haproxy-connect-timeout: 9000
+    to:
+      - '4'
+
+  neutron-dynamic-routing:
+    charm: ../../../neutron-dynamic-routing
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '6'
+
+  quagga:
+    charm: cs:~openstack-charmers-next/bionic/quagga
+    series: bionic
+    num_units: 1
+    to:
+      - '7'
+
+relations:
+
+  - - 'neutron-dynamic-routing:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-dynamic-routing:bgp-speaker'
+    - 'quagga:bgpclient'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - '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'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index b06a587..74c7d2d 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -3,6 +3,8 @@ configure:
 - zaza.openstack.charm_tests.dragent.configure.setup
 dev_bundles:
 gate_bundles:
+- focal-ussuri-functional
+- bionic-ussuri-functional
 - bionic-train-functional
 - bionic-stein-functional
 - bionic-rocky-functional
@@ -13,3 +15,6 @@ smoke_bundles:
 - bionic-train-functional
 tests:
 - zaza.openstack.charm_tests.dragent.tests.DRAgentTest
+tests_options:
+  force_deploy:
+    - focal-ussuri-functional