diff --git a/.zuul.yaml b/.zuul.yaml
index 7ffc71c..23bf5f6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-yoga-jobs
+      - openstack-python3-charm-zed-jobs
       - openstack-cover-jobs
diff --git a/charmcraft.yaml b/charmcraft.yaml
index c9a0ed7..22b5348 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -21,13 +21,13 @@ parts:
 bases:
   - build-on:
       - name: ubuntu
-        channel: "20.04"
+        channel: "22.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]
+      - name: ubuntu
+        channel: "22.10"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/osci.yaml b/osci.yaml
index 3bff244..9692976 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -2,8 +2,8 @@
     templates:
       - charm-unit-jobs-py38
       - charm-unit-jobs-py310
-      - charm-xena-functional-jobs
       - charm-yoga-functional-jobs
+      - charm-zed-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: barbican
diff --git a/src/config.yaml b/src/config.yaml
index bcc6955..aee1e14 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -45,6 +45,6 @@ options:
     description: |
       Maximum allowed http request size against the barbican-api.
   openstack-origin:
-    default: yoga
+    default: zed
   use-internal-endpoints:
     default: True
diff --git a/src/metadata.yaml b/src/metadata.yaml
index e0bbd0e..a3abc4f 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -8,8 +8,8 @@ description: |
 tags:
 - openstack
 series:
-- focal
 - jammy
+- kinetic
 subordinate: false
 requires:
   shared-db:
diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml
deleted file mode 100644
index d9d5e31..0000000
--- a/src/tests/bundles/focal-yoga.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-yoga
-
-local_overlay_enabled: False
-
-series: &series focal
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  barbican-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
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-    channel: latest/edge
-
-  barbican:
-    series: *series
-    charm: ../../../barbican.charm
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '4'
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '5'
-    channel: latest/edge
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'barbican:shared-db'
-    - 'barbican-mysql-router:shared-db'
-  - - 'barbican-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone:identity-service'
-    - 'barbican:identity-service'
-
-  - - 'rabbitmq-server:amqp'
-    - 'barbican:amqp'
diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/jammy-zed.yaml
similarity index 94%
rename from src/tests/bundles/focal-xena.yaml
rename to src/tests/bundles/jammy-zed.yaml
index 702c7d6..8f54724 100644
--- a/src/tests/bundles/focal-xena.yaml
+++ b/src/tests/bundles/jammy-zed.yaml
@@ -1,9 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin cloud:focal-xena
+  openstack-origin: &openstack-origin cloud:jammy-zed
 
 local_overlay_enabled: False
 
-series: &series focal
+series: &series jammy
 
 machines:
   '0':
diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/kinetic-zed.yaml
similarity index 98%
rename from src/tests/bundles/impish-xena.yaml
rename to src/tests/bundles/kinetic-zed.yaml
index 0f77f42..d0a3cd9 100644
--- a/src/tests/bundles/impish-xena.yaml
+++ b/src/tests/bundles/kinetic-zed.yaml
@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: False
 
-series: &series impish
+series: &series kinetic
 
 machines:
   '0':
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index ce31a14..ac7f38d 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,15 +1,14 @@
 charm_name: barbican
 smoke_bundles:
-- focal-xena
-gate_bundles:
-- focal-xena
-- impish-xena
-dev_bundles:
-- focal-yoga
 - jammy-yoga
+gate_bundles:
+- jammy-yoga
+dev_bundles:
+- jammy-yoga
+- jammy-zed
+- kinetic-zed
 tests:
 - zaza.openstack.charm_tests.barbican.tests.BarbicanTest
 tests_options:
   force_deploy:
-    - impish-xena
-    - jammy-yoga
+    - kinetic-zed