diff --git a/osci.yaml b/osci.yaml
index 07e03b1..149fe11 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -10,6 +10,7 @@
       - bionic-ussuri-42_trilio-api
       - focal-ussuri-41_trilio-api
       - focal-ussuri-42_trilio-api
+      - focal-wallaby-42_trilio-api
     vars:
       needs_charm_build: true
       charm_build_name: trilio-dm-api
@@ -31,6 +32,13 @@
       - focal-ussuri-42_trilio-api
     vars:
       tox_extra_args: focal-ussuri-41
+- job:
+    name: focal-wallaby-42_trilio-api
+    parent: func-target
+    dependencies:
+      - focal-ussuri-42_trilio-api
+    vars:
+      tox_extra_args: focal-wallaby-42
 - job:
     name: bionic-ussuri-42_trilio-api
     parent: func-target
diff --git a/src/tests/bundles/bionic-queens-41.yaml b/src/tests/bundles/bionic-queens-41.yaml
index 1db6a05..74e828c 100644
--- a/src/tests/bundles/bionic-queens-41.yaml
+++ b/src/tests/bundles/bionic-queens-41.yaml
@@ -5,7 +5,7 @@ variables:
   rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
   mysql-charm-channel: &mysql-charm-channel '5.7/edge'
   vault-charm-channel: &vault-charm-channel '1.7/edge'
-  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
+  trilio-charm-channel: &trilio-charm-channel 'latest/edge'
   trilio-openstack-origin: &trilio-openstack-origin 'cloud:bionic-stein'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
 
@@ -191,7 +191,7 @@ applications:
     channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: ch:openstack-charmers-trilio-data-mover
+    charm: ch:trilio-data-mover
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
@@ -202,12 +202,12 @@ applications:
       openstack-origin: *trilio-openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ch:openstack-charmers-trilio-horizon-plugin
+    charm: ch:trilio-horizon-plugin
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: ch:openstack-charmers-trilio-wlm
+    charm: ch:trilio-wlm
     channel: *trilio-charm-channel
     num_units: 1
     options:
diff --git a/src/tests/bundles/bionic-queens-42.yaml b/src/tests/bundles/bionic-queens-42.yaml
index 34cd0a0..df2bf3c 100644
--- a/src/tests/bundles/bionic-queens-42.yaml
+++ b/src/tests/bundles/bionic-queens-42.yaml
@@ -5,7 +5,7 @@ variables:
   rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
   mysql-charm-channel: &mysql-charm-channel '5.7/edge'
   vault-charm-channel: &vault-charm-channel '1.7/edge'
-  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
+  trilio-charm-channel: &trilio-charm-channel 'latest/edge'
   trilio-openstack-origin: &trilio-openstack-origin 'cloud:bionic-stein'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-2/ /'
 
@@ -191,7 +191,7 @@ applications:
     channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: ch:openstack-charmers-trilio-data-mover
+    charm: ch:trilio-data-mover
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
@@ -202,12 +202,12 @@ applications:
       openstack-origin: *trilio-openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ch:openstack-charmers-trilio-horizon-plugin
+    charm: ch:trilio-horizon-plugin
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: ch:openstack-charmers-trilio-wlm
+    charm: ch:trilio-wlm
     channel: *trilio-charm-channel
     num_units: 1
     options:
diff --git a/src/tests/bundles/bionic-ussuri-42.yaml b/src/tests/bundles/bionic-ussuri-42.yaml
index be54ae7..802ebe2 100644
--- a/src/tests/bundles/bionic-ussuri-42.yaml
+++ b/src/tests/bundles/bionic-ussuri-42.yaml
@@ -5,7 +5,7 @@ variables:
   rabbit-charm-channel: &rabbit-charm-channel '3.8/edge'
   mysql-charm-channel: &mysql-charm-channel '5.7/edge'
   vault-charm-channel: &vault-charm-channel '1.7/edge'
-  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
+  trilio-charm-channel: &trilio-charm-channel 'latest/edge'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-2/ /'
 
 
@@ -200,7 +200,7 @@ applications:
     channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: ch:openstack-charmers-trilio-data-mover
+    charm: ch:trilio-data-mover
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
@@ -211,12 +211,12 @@ applications:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ch:openstack-charmers-trilio-horizon-plugin
+    charm: ch:trilio-horizon-plugin
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: ch:openstack-charmers-trilio-wlm
+    charm: ch:trilio-wlm
     channel: *trilio-charm-channel
     num_units: 1
     options:
diff --git a/src/tests/bundles/focal-ussuri-41.yaml b/src/tests/bundles/focal-ussuri-41.yaml
index 780bbcf..c865cc8 100644
--- a/src/tests/bundles/focal-ussuri-41.yaml
+++ b/src/tests/bundles/focal-ussuri-41.yaml
@@ -5,7 +5,7 @@ variables:
   rabbit-charm-channel: &rabbit-charm-channel '3.9/edge'
   mysql-charm-channel: &mysql-charm-channel '8.0/edge'
   vault-charm-channel: &vault-charm-channel '1.7/edge'
-  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
+  trilio-charm-channel: &trilio-charm-channel 'latest/edge'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-1/ /'
 
 series: &series focal
@@ -254,7 +254,7 @@ applications:
     channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: ch:openstack-charmers-trilio-data-mover
+    charm: ch:trilio-data-mover
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
@@ -265,12 +265,12 @@ applications:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ch:openstack-charmers-trilio-horizon-plugin
+    charm: ch:trilio-horizon-plugin
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: ch:openstack-charmers-trilio-wlm
+    charm: ch:trilio-wlm
     channel: *trilio-charm-channel
     num_units: 1
     options:
diff --git a/src/tests/bundles/focal-ussuri-42.yaml b/src/tests/bundles/focal-ussuri-42.yaml
index ef7f0d5..d80db70 100644
--- a/src/tests/bundles/focal-ussuri-42.yaml
+++ b/src/tests/bundles/focal-ussuri-42.yaml
@@ -5,7 +5,7 @@ variables:
   rabbit-charm-channel: &rabbit-charm-channel '3.9/edge'
   mysql-charm-channel: &mysql-charm-channel '8.0/edge'
   vault-charm-channel: &vault-charm-channel '1.7/edge'
-  trilio-charm-channel: &trilio-charm-channel 'latest/stable'
+  trilio-charm-channel: &trilio-charm-channel 'latest/edge'
   triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-2/ /'
 
 series: &series focal
@@ -254,7 +254,7 @@ applications:
     channel: *rabbit-charm-channel
     num_units: 1
   trilio-data-mover:
-    charm: ch:openstack-charmers-trilio-data-mover
+    charm: ch:trilio-data-mover
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
@@ -265,12 +265,12 @@ applications:
       openstack-origin: *openstack-origin
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-horizon-plugin:
-    charm: ch:openstack-charmers-trilio-horizon-plugin
+    charm: ch:trilio-horizon-plugin
     channel: *trilio-charm-channel
     options:
       triliovault-pkg-source: *triliovault-pkg-source
   trilio-wlm:
-    charm: ch:openstack-charmers-trilio-wlm
+    charm: ch:trilio-wlm
     channel: *trilio-charm-channel
     num_units: 1
     options:
diff --git a/src/tests/bundles/focal-wallaby-42.yaml b/src/tests/bundles/focal-wallaby-42.yaml
new file mode 100644
index 0000000..03519bd
--- /dev/null
+++ b/src/tests/bundles/focal-wallaby-42.yaml
@@ -0,0 +1,320 @@
+variables:
+  openstack-origin: &openstack-origin 'cloud:focal-wallaby'
+  openstack-charm-channel: &openstack-charm-channel 'wallaby/edge'
+  ceph-charm-channel: &ceph-charm-channel 'pacific/edge'
+  rabbit-charm-channel: &rabbit-charm-channel '3.9/edge'
+  mysql-charm-channel: &mysql-charm-channel '8.0/edge'
+  vault-charm-channel: &vault-charm-channel '1.7/edge'
+  trilio-charm-channel: &trilio-charm-channel 'latest/edge'
+  triliovault-pkg-source: &triliovault-pkg-source 'deb [trusted=yes] https://apt.fury.io/triliodata-4-2/ /'
+
+series: &series focal
+
+relations:
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-gateway:amqp-nova'
+    - 'rabbitmq-server:amqp'
+  - - 'cinder:identity-service'
+    - 'keystone:identity-service'
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'neutron-openvswitch:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+  - - 'cinder:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'neutron-gateway:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'nova-cloud-controller:neutron-api'
+    - 'neutron-api:neutron-api'
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+  - - 'trilio-wlm:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'trilio-wlm:identity-service'
+    - 'keystone:identity-service'
+  - - 'glance:ceph'
+    - 'ceph-mon:client'
+  - - 'ceph-mon:osd'
+    - 'ceph-osd:mon'
+  - - 'ceph-osd:secrets-storage'
+    - 'vault:secrets'
+  - - 'cinder:storage-backend'
+    - 'cinder-ceph:storage-backend'
+  - - 'cinder-ceph:ceph'
+    - 'ceph-mon:client'
+  - - 'cinder-ceph:ceph-access'
+    - 'nova-compute:ceph-access'
+  - - 'vault:certificates'
+    - 'keystone:certificates'
+  - - 'vault:certificates'
+    - 'neutron-api:certificates'
+  - - 'vault:certificates'
+    - 'cinder:certificates'
+  - - 'vault:certificates'
+    - 'glance:certificates'
+  - - 'vault:certificates'
+    - 'nova-cloud-controller:certificates'
+  - - 'vault:certificates'
+    - 'trilio-wlm:certificates'
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+  - - 'vault:certificates'
+    - 'placement:certificates'
+  - - 'trilio-data-mover:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'trilio-data-mover:juju-info'
+    - 'nova-compute:juju-info'
+  - - 'trilio-dm-api:identity-service'
+    - 'keystone:identity-service'
+  - - 'trilio-dm-api:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'trilio-dm-api:certificates'
+    - 'vault:certificates'
+  - - 'trilio-horizon-plugin:dashboard-plugin'
+    - 'openstack-dashboard:dashboard-plugin'
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+  - - 'trilio-data-mover:ceph'
+    - 'ceph-mon:client'
+
+  - - 'trilio-dm-api:shared-db'
+    - 'trilio-dm-api-mysql-router:shared-db'
+  - - 'trilio-dm-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'trilio-dm-mysql-router:juju-info'
+    - 'nova-compute:juju-info'
+  - - 'trilio-data-mover:shared-db'
+    - 'trilio-dm-mysql-router:shared-db'
+  - - 'trilio-dm-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'trilio-wlm:shared-db'
+    - 'trilio-wlm-mysql-router:shared-db'
+  - - 'trilio-wlm-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+  - - 'cinder:shared-db'
+    - 'cinder-mysql-router:shared-db'
+  - - 'cinder-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'
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-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'
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+  - - 'placement:shared-db'
+    - 'placement-mysql-router:shared-db'
+  - - 'placement-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+applications:
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  cinder-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  neutron-api-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  glance-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  nova-cloud-controller-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  trilio-dm-api-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  trilio-dm-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  trilio-wlm-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  placement-mysql-router:
+    charm: ch:mysql-router
+    channel: *mysql-charm-channel
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    channel: *mysql-charm-channel
+    num_units: 3
+    options:
+      source: *openstack-origin
+  glance:
+    charm: ch:glance
+    channel: *openstack-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+  cinder:
+    charm: ch:cinder
+    channel: *openstack-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      block-device: "None"
+      glance-api-version: 2
+  keystone:
+    charm: ch:keystone
+    channel: *openstack-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      admin-password: openstack
+  neutron-api:
+    charm: ch:neutron-api
+    channel: *openstack-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      manage-neutron-plugin-legacy-mode: True
+  neutron-gateway:
+    charm: ch:neutron-gateway
+    channel: *openstack-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      bridge-mappings: physnet1:br-ex
+  neutron-openvswitch:
+    charm: ch:neutron-openvswitch
+    channel: *openstack-charm-channel
+    num_units: 0
+  nova-cloud-controller:
+    charm: ch:nova-cloud-controller
+    channel: *openstack-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      network-manager: Neutron
+      debug: true
+  nova-compute:
+    charm: ch:nova-compute
+    channel: *openstack-charm-channel
+    num_units: 3
+    constraints: mem=4G
+    options:
+      openstack-origin: *openstack-origin
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      debug: true
+      cpu-model: kvm64
+      cpu-mode: custom
+      # Allow for more retries when testing ontop of openstack
+      config-flags: block_device_allocate_retries=120
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    channel: *rabbit-charm-channel
+    num_units: 1
+  trilio-data-mover:
+    charm: ch:trilio-data-mover
+    channel: *trilio-charm-channel
+    options:
+      triliovault-pkg-source: *triliovault-pkg-source
+  trilio-dm-api:
+    charm: ../../../trilio-dm-api.charm
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      triliovault-pkg-source: *triliovault-pkg-source
+  trilio-horizon-plugin:
+    charm: ch:trilio-horizon-plugin
+    channel: *trilio-charm-channel
+    options:
+      triliovault-pkg-source: *triliovault-pkg-source
+  trilio-wlm:
+    charm: ch:trilio-wlm
+    channel: *trilio-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      triliovault-pkg-source: *triliovault-pkg-source
+  ceph-mon:
+    charm: ch:ceph-mon
+    channel: *ceph-charm-channel
+    num_units: 3
+    options:
+      source: *openstack-origin
+      expected-osd-count: 3
+  ceph-osd:
+    charm: ch:ceph-osd
+    channel: *ceph-charm-channel
+    constraints: mem=1G
+    num_units: 3
+    options:
+      source: *openstack-origin
+      osd-encrypt-keymanager: vault
+      osd-encrypt: True
+    storage:
+      osd-devices:  cinder,40G
+  cinder-ceph:
+    charm: ch:cinder-ceph
+    channel: *openstack-charm-channel
+  vault:
+    charm: ch:vault
+    channel: *vault-charm-channel
+    num_units: 1
+  placement:
+    charm: ch:placement
+    channel: *openstack-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+  nfs-server-test-fixture:
+    charm: cs:~openstack-charmers-next/nfs-server-test-fixture
+    num_units: 1
+    storage:
+      share: cinder,40G
+  openstack-dashboard:
+    charm: ch:openstack-dashboard
+    channel: *openstack-charm-channel
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index c40df3b..d10219a 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -13,6 +13,7 @@ configure:
 gate_bundles:
   - focal-ussuri-42
   - focal-ussuri-41
+  - focal-wallaby-42
   - bionic-ussuri-42
   - bionic-queens-42
   - bionic-queens-41