diff --git a/osci.yaml b/osci.yaml
index ea493e7..14d197c 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -9,7 +9,9 @@
       - bionic-ussuri
       - focal-ussuri
       - focal-victoria
+      - focal-wallaby
       - groovy-victoria
+      - hirsute-wallaby
     vars:
       needs_charm_build: true
-      charm_build_name: keystone-kerberos
\ No newline at end of file
+      charm_build_name: keystone-kerberos
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
new file mode 100644
index 0000000..f61ddf9
--- /dev/null
+++ b/src/tests/bundles/focal-wallaby.yaml
@@ -0,0 +1,65 @@
+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':
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - keystone
+  - keystone-kerberos
+applications:
+  keystone-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
+      token-provider: 'fernet'
+      token-expiration: 60
+    to:
+    - '3'
+  keystone-kerberos:
+    charm: ../../../keystone-kerberos
+    options:
+      kerberos-realm: 'TESTUBUNTU.COM'
+      kerberos-server: 'kerberos.testubuntu.com'
+      kerberos-domain: 'k8s'
+    resource:
+      keystone_keytab: keystone.keytab
+
+  kerberos-server:
+    charm: cs:~openstack-charmers-next/kerberos-test-fixture
+    num_units: 1
+    to:
+      - '4'
+  ubuntu-test-host:
+    charm: cs:ubuntu
+    num_units: 1
+    to:
+      - '5'
diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml
new file mode 100644
index 0000000..ca4bbb4
--- /dev/null
+++ b/src/tests/bundles/hirsute-wallaby.yaml
@@ -0,0 +1,65 @@
+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':
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - keystone
+  - keystone-kerberos
+applications:
+  keystone-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
+      token-provider: 'fernet'
+      token-expiration: 60
+    to:
+    - '3'
+  keystone-kerberos:
+    charm: ../../../keystone-kerberos
+    options:
+      kerberos-realm: 'TESTUBUNTU.COM'
+      kerberos-server: 'kerberos.testubuntu.com'
+      kerberos-domain: 'k8s'
+    resource:
+      keystone_keytab: keystone.keytab
+
+  kerberos-server:
+    charm: cs:~openstack-charmers-next/kerberos-test-fixture
+    num_units: 1
+    to:
+      - '4'
+  ubuntu-test-host:
+    charm: cs:ubuntu
+    num_units: 1
+    to:
+      - '5'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index a4957c2..714583d 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,6 +1,8 @@
 charm_name: keystone-kerberos
+
 smoke_bundles:
-  - bionic-train
+  - focal-ussuri
+
 gate_bundles:
   - bionic-queens
   - bionic-stein
@@ -8,16 +10,23 @@ gate_bundles:
   - bionic-ussuri
   - focal-ussuri
   - focal-victoria
+  - focal-wallaby
   - groovy-victoria
+
 dev_bundles:
   - bionic-rocky
+  - hirsute-wallaby
+
 configure:
   - zaza.openstack.charm_tests.kerberos.setup.run_all_configuration_steps
+
 tests:
   - zaza.openstack.charm_tests.kerberos.tests.CharmKeystoneKerberosTest
+
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby
+
 target_deploy_status:
   keystone-kerberos:
     workload-status: blocked