diff --git a/.zuul.yaml b/.zuul.yaml
index 0eed1965..7ffc71cb 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 11d5f7cd..eb74c308 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -22,7 +22,15 @@ parts:
       - README.md
 
 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]
diff --git a/metadata.yaml b/metadata.yaml
index 8f9e340b..3897b807 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -11,7 +11,7 @@ tags:
 - misc
 series:
 - focal
-- impish
+- jammy
 provides:
   amqp:
     interface: rabbitmq
diff --git a/osci.yaml b/osci.yaml
index ab490b3c..255c9b3e 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,8 +1,7 @@
 - project:
     templates:
       - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
-      - charm-xena-functional-jobs
+      - charm-unit-jobs-py310
       - charm-yoga-functional-jobs
     vars:
       needs_charm_build: true
diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml
deleted file mode 100644
index 5c2539f8..00000000
--- a/tests/bundles/focal-xena.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-xena
-
-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':
-  '7':
-  '8':
-    series: bionic  # nagios not supported on focal yet
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-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
-
-  rabbitmq-server:
-    charm: ../../rabbitmq-server.charm
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '7'
-    channel: latest/edge
-
-  nagios:
-    charm: cs:nagios
-    series: bionic  # not supported on focal yet
-    num_units: 1
-    to:
-      - '8'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'nrpe:nrpe-external-master'
-    - 'rabbitmq-server:nrpe-external-master'
-  - - 'nrpe:monitors'
-    - 'nagios:monitors'
diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml
deleted file mode 100644
index 76f24b57..00000000
--- a/tests/bundles/impish-xena.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: impish
-
-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':
-  '7':
-  '8':
-    series: bionic  # nagios not supported on focal+ yet
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-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
-
-  rabbitmq-server:
-    charm: ../../rabbitmq-server.charm
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '7'
-    channel: latest/edge
-
-  nagios:
-    charm: cs:nagios
-    series: bionic  # not supported on focal+ yet
-    num_units: 1
-    to:
-      - '8'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'nrpe:nrpe-external-master'
-    - 'rabbitmq-server:nrpe-external-master'
-  - - 'nrpe:monitors'
-    - 'nagios:monitors'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 204aafc0..523e85b2 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,15 +1,12 @@
 charm_name: rabbitmq-server
 
 smoke_bundles:
-  - focal-xena
+  - focal-yoga
 
 gate_bundles:
-  - focal-wallaby
-  - focal-xena
-  - impish-xena
+  - focal-yoga
 
 dev_bundles:
-  - focal-yoga
   - jammy-yoga
 
 tests:
@@ -19,5 +16,4 @@ tests:
 tests_options:
   force_deploy:
     # nrpe charm doesn't support hirsute->jammy and needs to be force installed
-    - impish-xena
     - jammy-yoga
diff --git a/tox.ini b/tox.ini
index 81fd2492..17751078 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,11 +51,6 @@ commands =
     charmcraft -v build
     {toxinidir}/rename.sh
 
-[testenv:py35]
-basepython = python3.5
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-
 [testenv:py36]
 basepython = python3.6
 deps = -r{toxinidir}/requirements.txt
@@ -81,6 +76,11 @@ basepython = python3
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
+[testenv:py310]
+basepython = python3.10
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2