diff --git a/charmcraft.yaml b/charmcraft.yaml
index 4968216..c9a0ed7 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]
diff --git a/osci.yaml b/osci.yaml
index 6fa4403..82c1a06 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,7 +1,7 @@
 - project:
     templates:
       - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
+      - charm-unit-jobs-py310 
       - charm-xena-functional-jobs
       - charm-yoga-functional-jobs
     vars:
diff --git a/src/metadata.yaml b/src/metadata.yaml
index c471b66..e07c5f4 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -8,7 +8,7 @@ tags:
 - networking
 series:
 - focal
-- impish
+- jammy
 subordinate: false
 extra-bindings:
   data:
diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml
deleted file mode 100644
index 1995dd0..0000000
--- a/src/tests/bundles/impish-xena.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-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':
-
-applications:
-
-  vault-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
-
-  vault:
-    charm: ch:vault
-    num_units: 1
-    to:
-      - '3'
-    channel: latest/edge
-  
-  nrpe:
-    charm: cs:nrpe
-
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-    channel: latest/edge
-
-  ovn-dedicated-chassis:
-    charm: ../../../ovn-dedicated-chassis.charm
-    num_units: 2
-    options:
-      source: *openstack-origin
-    to:
-      - '7'
-      - '8'
-
-
-relations:
-
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'ovn-central:certificates'
-    - 'vault:certificates'
-  - - 'ovn-dedicated-chassis:ovsdb'
-    - 'ovn-central:ovsdb'
-  - - 'ovn-dedicated-chassis:certificates'
-    - 'vault:certificates'
-  - - 'ovn-dedicated-chassis:nrpe-external-master'
-    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml
index a27541e..5f7b6a1 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/jammy-yoga.yaml
@@ -45,9 +45,6 @@ applications:
       - '3'
     channel: latest/edge
   
-  nrpe:
-    charm: cs:nrpe
-
   ovn-central:
     charm: ch:ovn-central
     num_units: 3
@@ -81,5 +78,3 @@ relations:
     - 'ovn-central:ovsdb'
   - - 'ovn-dedicated-chassis:certificates'
     - 'vault:certificates'
-  - - 'ovn-dedicated-chassis:nrpe-external-master'
-    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 4ee7eb0..b0d1144 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -2,13 +2,12 @@ charm_name: ovn-dedicated-chassis
 
 gate_bundles:
 - focal-xena
-- impish-xena
+- focal-yoga
 
 smoke_bundles:
-- focal-xena
+- focal-yoga
 
 dev_bundles:
-- focal-yoga
 - jammy-yoga
 
 target_deploy_status:
diff --git a/tox.ini b/tox.ini
index 2d60b8a..5b6e7a1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -93,6 +93,11 @@ basepython = python3.9
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py310]
+basepython = python3.10
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2