diff --git a/osci.yaml b/osci.yaml
index a394530..1492c76 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -3,7 +3,9 @@
       - charm-unit-jobs
     check:
       jobs:
+      - hirsute-wallaby
       - groovy-victoria
+      - focal-wallaby
       - focal-victoria
       - focal-ussuri
       - bionic-ussuri
diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml
new file mode 100644
index 0000000..b48e8e1
--- /dev/null
+++ b/tests/bundles/focal-wallaby.yaml
@@ -0,0 +1,105 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+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':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-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'
+
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  swift-proxy:
+    charm: cs:~openstack-charmers-next/swift-proxy
+    num_units: 1
+    options:
+      zone-assignment: manual
+      replicas: 1
+      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  swift-storage:
+    charm: swift-storage
+    num_units: 1
+    storage:
+      block-devices: 'cinder,10G'
+    options:
+      zone: 1
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'swift-proxy:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'swift-storage:swift-storage'
+    - 'swift-proxy:swift-storage'
+
+  - - 'glance:object-store'
+    - 'swift-proxy:object-store'
diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml
new file mode 100644
index 0000000..97cd5dd
--- /dev/null
+++ b/tests/bundles/hirsute-wallaby.yaml
@@ -0,0 +1,105 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: hirsute
+
+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':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-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'
+
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  swift-proxy:
+    charm: cs:~openstack-charmers-next/swift-proxy
+    num_units: 1
+    options:
+      zone-assignment: manual
+      replicas: 1
+      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  swift-storage:
+    charm: swift-storage
+    num_units: 1
+    storage:
+      block-devices: 'cinder,10G'
+    options:
+      zone: 1
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'swift-proxy:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'swift-storage:swift-storage'
+    - 'swift-proxy:swift-storage'
+
+  - - 'glance:object-store'
+    - 'swift-proxy:object-store'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index ad58b22..4b6bc4f 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,6 +1,8 @@
 charm_name: swift-storage
+
 gate_bundles:
   - groovy-victoria
+  - focal-wallaby
   - focal-victoria
   - focal-ussuri
   - bionic-ussuri
@@ -16,13 +18,19 @@ gate_bundles:
   - bionic-train-gr:
     - swift_gr_region1: bionic-train-gr-r1
     - swift_gr_region2: bionic-train-gr-r2
+
 smoke_bundles:
-  - bionic-train
+  - focal-ussuri
+
+dev_bundles:
+  - hirsute-wallaby
+
 tests:
   - zaza.openstack.charm_tests.swift.tests.SwiftImageCreateTest
   - zaza.openstack.charm_tests.swift.tests.SwiftStorageTests
   - swift_gr_region1:
     - zaza.openstack.charm_tests.swift.tests.SwiftGlobalReplicationTests
+
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby