diff --git a/osci.yaml b/osci.yaml
index ad9a270..b5f6e59 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -3,11 +3,13 @@
       - charm-unit-jobs
     check:
       jobs:
+      - hirsute-wallaby
       - groovy-victoria
+      - focal-wallaby
       - focal-victoria
       - focal-ussuri
       - bionic-train
       - bionic-ussuri
     vars:
       needs_charm_build: true
-      charm_build_name: ironic-api
\ No newline at end of file
+      charm_build_name: ironic-api
diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml
new file mode 100644
index 0000000..1249037
--- /dev/null
+++ b/src/tests/bundles/focal-wallaby.yaml
@@ -0,0 +1,283 @@
+options:
+  source: &source cloud:focal-wallaby
+series: focal
+relations:
+- - nova-ironic
+  - ironic-api
+- - ironic-conductor
+  - ironic-api
+- - neutron-ironic-agent:identity-credentials
+  - keystone
+- - neutron-ironic-agent
+  - neutron-api
+- - neutron-openvswitch
+  - neutron-api
+- - ironic-api:amqp
+  - rabbitmq-server:amqp
+- - ironic-api
+  - keystone
+- - ironic-api:shared-db
+  - ironic-api-mysql-router:shared-db
+- - ironic-conductor:amqp
+  - rabbitmq-server:amqp
+- - ironic-conductor
+  - keystone
+- - ironic-conductor:shared-db
+  - ironic-conductor-mysql-router:shared-db
+- - nova-ironic:amqp
+  - rabbitmq-server:amqp
+- - nova-ironic
+  - glance
+- - nova-ironic
+  - keystone
+- - nova-ironic
+  - nova-cloud-controller
+- - neutron-gateway:amqp
+  - rabbitmq-server:amqp
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - glance:identity-service
+  - keystone:identity-service
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - neutron-api:shared-db
+  - neutron-api-mysql-router:shared-db
+- - neutron-api:amqp
+  - rabbitmq-server:amqp
+- - neutron-gateway:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - glance:shared-db
+  - glance-mysql-router:shared-db
+- - glance:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:image-service
+  - glance:image-service
+- - nova-cloud-controller:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:quantum-network-service
+  - neutron-gateway:quantum-network-service
+- - nova-cloud-controller:shared-db
+  - nova-cloud-controller-mysql-router:shared-db
+- - nova-cloud-controller:neutron-api
+  - neutron-api:neutron-api
+- - cinder:image-service
+  - glance:image-service
+- - cinder:amqp
+  - rabbitmq-server:amqp
+- - cinder:identity-service
+  - keystone:identity-service
+- - cinder:cinder-volume-service
+  - nova-cloud-controller:cinder-volume-service
+- - cinder:shared-db
+  - cinder-mysql-router:shared-db
+- - placement:shared-db
+  - placement-mysql-router:shared-db
+- - placement
+  - keystone
+- - placement
+  - nova-cloud-controller
+- - ceph-mon:client
+  - nova-ironic:ceph
+- - ceph-mon:client
+  - glance:ceph
+- - ceph-radosgw:mon
+  - ceph-mon:radosgw
+- - ceph-radosgw:identity-service
+  - keystone:identity-service
+- - ceph-osd:mon
+  - ceph-mon:osd
+- - ceph-radosgw:object-store
+  - glance
+- - mysql-innodb-cluster:db-router
+  - nova-cloud-controller-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - keystone-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - glance-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - neutron-api-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - placement-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - cinder-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - ironic-api-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - ironic-conductor-mysql-router:db-router
+- - vault-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - vault:shared-db
+  - vault-mysql-router:shared-db
+- - vault:certificates
+  - ceph-radosgw
+- - vault:certificates
+  - cinder
+- - vault:certificates
+  - glance:certificates
+- - vault:certificates
+  - keystone:certificates
+- - vault:certificates
+  - neutron-api:certificates
+- - vault:certificates
+  - nova-cloud-controller:certificates
+- - vault:certificates
+  - placement:certificates
+- - vault
+  - ironic-conductor
+- - vault:certificates
+  - ironic-api:certificates
+- - ironic-api
+  - hacluster-ironic
+services:
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  placement-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  vault-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  ironic-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  ironic-conductor-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    constraints: mem=4G
+    options:
+      source: *source
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    constraints: mem=2G
+    options:
+      block-device: vdb
+      glance-api-version: 2
+      openstack-origin: *source
+      worker-multiplier: 0.25
+    storage:
+      block-devices: cinder,50G
+  ceph-radosgw:
+    charm: cs:~openstack-charmers-next/ceph-radosgw
+    num_units: 1
+    constraints: mem=2G
+    options:
+      source: *source
+      namespace-tenants: True
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    constraints: mem=2G
+    options:
+      expected-osd-count: 3
+      source: *source
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    constraints: mem=2G
+    options:
+      source: *source
+    storage:
+      osd-devices: 'cinder,30G'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      worker-multiplier: 0.25
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      worker-multiplier: 0.25
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    constraints: mem=2G
+    options:
+      flat-network-providers: "physnet1"
+      neutron-security-groups: true
+      openstack-origin: *source
+      manage-neutron-plugin-legacy-mode: false
+      worker-multiplier: 0.25
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      enable-isolated-metadata: true
+      enable-metadata-network: true
+      bridge-mappings: physnet1:br-ex
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    constraints: mem=2G
+    options:
+      network-manager: Neutron
+      openstack-origin: *source
+      worker-multiplier: 0.25
+  nova-ironic:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    constraints: mem=2G
+    options:
+      enable-live-migration: false
+      enable-resize: false
+      openstack-origin: *source
+      virt-type: ironic
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      worker-multiplier: 0.25
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    constraints: mem=2G
+  hacluster-ironic:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+  ironic-api:
+    charm: ../../../ironic-api
+    num_units: 3
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+  ironic-conductor:
+    charm: cs:~openstack-charmers-next/ironic-conductor
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      max-tftp-block-size: 1418
+      disable-secure-erase: true
+      use-ipxe: true
+      enabled-network-interfaces: "flat, noop"
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+    options:
+      bridge-mappings: physnet1:br-ex
+  neutron-ironic-agent:
+    charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
+    num_units: 0
+    options:
+      openstack-origin: *source
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml
new file mode 100644
index 0000000..e9d94e6
--- /dev/null
+++ b/src/tests/bundles/hirsute-wallaby.yaml
@@ -0,0 +1,283 @@
+options:
+  source: &source distro
+series: hirsute
+relations:
+- - nova-ironic
+  - ironic-api
+- - ironic-conductor
+  - ironic-api
+- - neutron-ironic-agent:identity-credentials
+  - keystone
+- - neutron-ironic-agent
+  - neutron-api
+- - neutron-openvswitch
+  - neutron-api
+- - ironic-api:amqp
+  - rabbitmq-server:amqp
+- - ironic-api
+  - keystone
+- - ironic-api:shared-db
+  - ironic-api-mysql-router:shared-db
+- - ironic-conductor:amqp
+  - rabbitmq-server:amqp
+- - ironic-conductor
+  - keystone
+- - ironic-conductor:shared-db
+  - ironic-conductor-mysql-router:shared-db
+- - nova-ironic:amqp
+  - rabbitmq-server:amqp
+- - nova-ironic
+  - glance
+- - nova-ironic
+  - keystone
+- - nova-ironic
+  - nova-cloud-controller
+- - neutron-gateway:amqp
+  - rabbitmq-server:amqp
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - glance:identity-service
+  - keystone:identity-service
+- - neutron-api:identity-service
+  - keystone:identity-service
+- - neutron-api:shared-db
+  - neutron-api-mysql-router:shared-db
+- - neutron-api:amqp
+  - rabbitmq-server:amqp
+- - neutron-gateway:neutron-plugin-api
+  - neutron-api:neutron-plugin-api
+- - glance:shared-db
+  - glance-mysql-router:shared-db
+- - glance:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:image-service
+  - glance:image-service
+- - nova-cloud-controller:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:quantum-network-service
+  - neutron-gateway:quantum-network-service
+- - nova-cloud-controller:shared-db
+  - nova-cloud-controller-mysql-router:shared-db
+- - nova-cloud-controller:neutron-api
+  - neutron-api:neutron-api
+- - cinder:image-service
+  - glance:image-service
+- - cinder:amqp
+  - rabbitmq-server:amqp
+- - cinder:identity-service
+  - keystone:identity-service
+- - cinder:cinder-volume-service
+  - nova-cloud-controller:cinder-volume-service
+- - cinder:shared-db
+  - cinder-mysql-router:shared-db
+- - placement:shared-db
+  - placement-mysql-router:shared-db
+- - placement
+  - keystone
+- - placement
+  - nova-cloud-controller
+- - ceph-mon:client
+  - nova-ironic:ceph
+- - ceph-mon:client
+  - glance:ceph
+- - ceph-radosgw:mon
+  - ceph-mon:radosgw
+- - ceph-radosgw:identity-service
+  - keystone:identity-service
+- - ceph-osd:mon
+  - ceph-mon:osd
+- - ceph-radosgw:object-store
+  - glance
+- - mysql-innodb-cluster:db-router
+  - nova-cloud-controller-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - keystone-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - glance-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - neutron-api-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - placement-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - cinder-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - ironic-api-mysql-router:db-router
+- - mysql-innodb-cluster:db-router
+  - ironic-conductor-mysql-router:db-router
+- - vault-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - vault:shared-db
+  - vault-mysql-router:shared-db
+- - vault:certificates
+  - ceph-radosgw
+- - vault:certificates
+  - cinder
+- - vault:certificates
+  - glance:certificates
+- - vault:certificates
+  - keystone:certificates
+- - vault:certificates
+  - neutron-api:certificates
+- - vault:certificates
+  - nova-cloud-controller:certificates
+- - vault:certificates
+  - placement:certificates
+- - vault
+  - ironic-conductor
+- - vault:certificates
+  - ironic-api:certificates
+- - ironic-api
+  - hacluster-ironic
+services:
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  placement-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  vault-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  ironic-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  ironic-conductor-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    constraints: mem=4G
+    options:
+      source: *source
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    constraints: mem=2G
+    options:
+      block-device: vdb
+      glance-api-version: 2
+      openstack-origin: *source
+      worker-multiplier: 0.25
+    storage:
+      block-devices: cinder,50G
+  ceph-radosgw:
+    charm: cs:~openstack-charmers-next/ceph-radosgw
+    num_units: 1
+    constraints: mem=2G
+    options:
+      source: *source
+      namespace-tenants: True
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    constraints: mem=2G
+    options:
+      expected-osd-count: 3
+      source: *source
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    constraints: mem=2G
+    options:
+      source: *source
+    storage:
+      osd-devices: 'cinder,30G'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      worker-multiplier: 0.25
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      worker-multiplier: 0.25
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    constraints: mem=2G
+    options:
+      flat-network-providers: "physnet1"
+      neutron-security-groups: true
+      openstack-origin: *source
+      manage-neutron-plugin-legacy-mode: false
+      worker-multiplier: 0.25
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      enable-isolated-metadata: true
+      enable-metadata-network: true
+      bridge-mappings: physnet1:br-ex
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    constraints: mem=2G
+    options:
+      network-manager: Neutron
+      openstack-origin: *source
+      worker-multiplier: 0.25
+  nova-ironic:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    constraints: mem=2G
+    options:
+      enable-live-migration: false
+      enable-resize: false
+      openstack-origin: *source
+      virt-type: ironic
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      worker-multiplier: 0.25
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    constraints: mem=2G
+  hacluster-ironic:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+  ironic-api:
+    charm: ../../../ironic-api
+    num_units: 3
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+  ironic-conductor:
+    charm: cs:~openstack-charmers-next/ironic-conductor
+    num_units: 1
+    constraints: mem=2G
+    options:
+      openstack-origin: *source
+      max-tftp-block-size: 1418
+      disable-secure-erase: true
+      use-ipxe: true
+      enabled-network-interfaces: "flat, noop"
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+    options:
+      bridge-mappings: physnet1:br-ex
+  neutron-ironic-agent:
+    charm: cs:~openstack-charmers-next/neutron-api-plugin-ironic
+    num_units: 0
+    options:
+      openstack-origin: *source
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index a7ef3dd..dbc7cb3 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,12 +1,19 @@
 charm_name: ironic-api
+
 gate_bundles:
 - groovy-victoria
+- focal-wallaby
 - focal-victoria
 - focal-ussuri
 - bionic-train
 - bionic-ussuri
+
+dev_bundles:
+- hirsute-wallaby
+
 smoke_bundles:
-- bionic-ussuri
+- focal-ussuri
+
 target_deploy_status:
   vault:
     workload-status: blocked
@@ -14,6 +21,7 @@ target_deploy_status:
   ironic-conductor:
     workload-status: blocked
     workload-status-message: invalid enabled-deploy-interfaces config
+
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize
 - zaza.openstack.charm_tests.ironic.setup.set_temp_url_secret
@@ -25,8 +33,10 @@ configure:
 # call to create that flat network
 #- zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
 - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
+
 tests:
 - zaza.openstack.charm_tests.ironic.tests.IronicTest
+
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby