diff --git a/.zuul.yaml b/.zuul.yaml
index 0eed196..7ffc71c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-charm-yoga-jobs
       - openstack-cover-jobs
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 4968216..883fc9b 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -19,7 +19,15 @@ parts:
       cp -r $CHARMCRAFT_STAGE/* .
 
 bases:
-  - name: ubuntu
-    channel: "20.04"
-    architectures:
-      - amd64
+  - build-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
\ No newline at end of file
diff --git a/src/config.yaml b/src/config.yaml
index 675c9b6..3c4fa28 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -5,7 +5,7 @@ options:
     description: Mon and OSD debug level. Max is 20.
   source:
     type: string
-    default: distro
+    default: yoga
     description: |
       Optional configuration to support use of additional sources such as:
       .
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 0172735..1bdda04 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -11,7 +11,7 @@ tags:
 - misc
 series:
 - focal
-- impish
+- jammy
 subordinate: false
 requires:
   ceph-mds:
diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml
deleted file mode 100644
index fd96fc1..0000000
--- a/src/tests/bundles/impish-xena.yaml
+++ /dev/null
@@ -1,241 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-series: &series impish
-
-machines:
-  '0':
-    constraints: "mem=3072M"
-  '1':
-    constraints: "mem=3072M"
-  '2':
-    constraints: "mem=3072M"
-  '3':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  ceph-fs:
-    charm: ../../../ceph-fs.charm
-    num_units: 1
-    options:
-      source: *openstack-origin
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-    to:
-      - '3'
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-      source: *openstack-origin
-    channel: latest/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      source: *openstack-origin
-    channel: latest/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-
-  keystone:
-    expose: True
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-  glance:
-    expose: True
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-  nova-cloud-controller:
-    expose: True
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    constraints: mem=8G
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-  neutron-api:
-    charm: ch: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
-    channel: latest/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: latest/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-relations:
-
-  - - 'ceph-mon:mds'
-    - 'ceph-fs:ceph-mds'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:ceph'
-    - 'ceph-mon:client'
-
-  - - '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'
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'glance:ceph'
-    - 'ceph-mon:client'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'nova-cloud-controller:shared-db'
-    - 'nova-cloud-controller-mysql-router:shared-db'
-  - - 'nova-cloud-controller-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - 'placement:shared-db'
-    - 'placement-mysql-router:shared-db'
-  - - 'placement-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'placement'
-    - 'keystone'
-
-  - - 'placement'
-    - 'nova-cloud-controller'
-
-  - - '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:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:neutron-plugin-api'
-    - 'neutron-gateway:neutron-plugin-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-openvswitch:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 8d0a4d2..d0bcbc6 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,7 +1,6 @@
 charm_name: ceph-fs
 gate_bundles:
   - focal-xena
-  - impish-wallaby
 dev_bundles:
   - focal-yoga
   - jammy-yoga
@@ -19,5 +18,4 @@ tests:
   - zaza.openstack.charm_tests.ceph.tests.BlueStoreCompressionCharmOperation
 tests_options:
   force_deploy:
-    - impish-xena
     - jammy-yoga