diff --git a/.zuul.yaml b/.zuul.yaml
index 7cb4023..23bf5f6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-train-jobs
+      - openstack-python3-charm-zed-jobs
       - openstack-cover-jobs
diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 0000000..17575d9
--- /dev/null
+++ b/bindep.txt
@@ -0,0 +1,4 @@
+libffi-dev [platform:dpkg]
+libpq-dev [platform:dpkg]
+libxml2-dev [platform:dpkg]
+libxslt1-dev [platform:dpkg]
diff --git a/charmcraft.yaml b/charmcraft.yaml
index c9a0ed7..0604425 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -2,32 +2,24 @@ type: charm
 
 parts:
   charm:
-    build-packages:
-      - tox
-      - git
-      - python3-dev
-    override-build: |
-      apt-get install ca-certificates -y
-      tox -e build-reactive
-    override-stage: |
-      echo "Copying charm to staging area: $CHARMCRAFT_STAGE"
-      NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds)
-      cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/
-    override-prime: |
-      # For some reason, the normal priming chokes on the fact that there's a
-      # hooks directory.
-      cp -r $CHARMCRAFT_STAGE/* .
+    source: src/
+    plugin: reactive
+    build-snaps:
+      - charm
+    build-environment:
+      - CHARM_INTERFACES_DIR: /root/project/interfaces/
+      - CHARM_LAYERS_DIR: /root/project/layers/
 
 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 7fded75..d06e4d4 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,10 +1,9 @@
 - project:
     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: ovn-central
       build_type: charmcraft
+      charmcraft_channel: 2.0/stable
diff --git a/requirements.txt b/requirements.txt
index a68620f..b3dc23f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,16 +8,13 @@
 # requirements.txt
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
-# Build requirements
-cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
-charm-tools==2.8.3
+# NOTE: newer versions of cryptography require a Rust compiler to build,
+# see
+# * https://github.com/openstack-charmers/zaza/issues/421
+# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
+#
+cryptography<3.4
+
+git+https://github.com/juju/charm-tools.git
 
 simplejson
-
-# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
-# "ModuleNotFoundError")
-# NOTE(lourot): This might look like a duplication of test-requirements.txt but
-# some tox targets use only test-requirements.txt whereas charm-build uses only
-# requirements.txt
-importlib-metadata<3.0.0; python_version < '3.6'
-importlib-resources<3.0.0; python_version < '3.6'
diff --git a/src/config.yaml b/src/config.yaml
index 68eae1c..5647d6c 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -1,6 +1,6 @@
 options:
   source:
-    default: yoga
+    default: zed
     type: string
     description: |
       Repository from which to install OVS+OVN
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 9ec0b8d..539e5ae 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -24,7 +24,6 @@ description: |
 tags:
 - networking
 series:
-- focal
 - jammy
 subordinate: false
 provides:
diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/jammy-zed.yaml
similarity index 85%
rename from src/tests/bundles/focal-yoga.yaml
rename to src/tests/bundles/jammy-zed.yaml
index 17f08e0..a5a2cd8 100644
--- a/src/tests/bundles/focal-yoga.yaml
+++ b/src/tests/bundles/jammy-zed.yaml
@@ -1,9 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin cloud:focal-yoga
+  openstack-origin: &openstack-origin cloud:jammy-zed
 
 local_overlay_enabled: False
 
-series: focal
+series: jammy
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -52,9 +52,6 @@ applications:
       - '5'
       - '6'
 
-  nrpe:
-    charm: cs:nrpe
-
 relations:
 
   - - 'vault:shared-db'
@@ -64,5 +61,3 @@ relations:
 
   - - 'ovn-central:certificates'
     - 'vault:certificates'
-  - - 'nrpe:nrpe-external-master'
-    - 'ovn-central:nrpe-external-master'
diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/kinetic-zed.yaml
similarity index 82%
rename from src/tests/bundles/focal-xena.yaml
rename to src/tests/bundles/kinetic-zed.yaml
index b501bca..a98e765 100644
--- a/src/tests/bundles/focal-xena.yaml
+++ b/src/tests/bundles/kinetic-zed.yaml
@@ -1,9 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin cloud:focal-xena
+  openstack-origin: &openstack-origin distro
 
 local_overlay_enabled: False
 
-series: focal
+series: kinetic
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -47,15 +47,11 @@ applications:
     charm: ../../../ovn-central.charm
     num_units: 3
     options:
-      source: *openstack-origin
     to:
       - '4'
       - '5'
       - '6'
 
-  nrpe:
-    charm: cs:nrpe
-
 relations:
 
   - - 'vault:shared-db'
@@ -65,5 +61,3 @@ relations:
 
   - - 'ovn-central:certificates'
     - 'vault:certificates'
-  - - 'nrpe:nrpe-external-master'
-    - 'ovn-central:nrpe-external-master'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 15af9bd..16206b0 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,14 +1,15 @@
 charm_name: ovn-central
 
 gate_bundles:
-- focal-xena
-- focal-yoga
+- jammy-yoga
 
 smoke_bundles:
-- focal-yoga
+- jammy-yoga
 
 dev_bundles:
 - jammy-yoga
+- jammy-zed
+- kinetic-zed
 
 target_deploy_status:
   ovn-central:
@@ -32,4 +33,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - jammy-yoga
+    - kinetic-zed
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 870b97d..97ca0d1 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -3,6 +3,9 @@ psutil
 poetry-core
 six
 
+# pin zipp to a version that does not require setuptools>=42
+zipp<=1.2.0
+
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
 
 git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
diff --git a/test-requirements.txt b/test-requirements.txt
index a11a7d0..a7936e6 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,6 @@
 #     https://github.com/openstack-charmers/release-tools
 #
 pyparsing<3.0.0  # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
-cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 stestr>=2.2.0
@@ -13,25 +12,10 @@ stestr>=2.2.0
 # https://github.com/mtreinish/stestr/issues/145
 cliff<3.0.0
 
-# Dependencies of stestr. Newer versions use keywords that didn't exist in
-# python 3.5 yet (e.g. "ModuleNotFoundError")
-importlib-metadata<3.0.0; python_version < '3.6'
-importlib-resources<3.0.0; python_version < '3.6'
-
-# Some Zuul nodes sometimes pull newer versions of these dependencies which
-# dropped support for python 3.5:
-osprofiler<2.7.0;python_version<'3.6'
-stevedore<1.31.0;python_version<'3.6'
-debtcollector<1.22.0;python_version<'3.6'
-oslo.utils<=3.41.0;python_version<'3.6'
-
 requests>=2.18.4
 charms.reactive
 
-# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
-# f'{something}'
-mock>=1.2,<4.0.0; python_version < '3.6'
-mock>=1.2; python_version >= '3.6'
+mock>=1.2
 
 nose>=1.3.7
 coverage>=3.6
diff --git a/tox.ini b/tox.ini
index 5b6e7a1..bdde110 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,10 +31,8 @@ minversion = 3.18.0
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
          TERM=linux
-         LAYER_PATH={toxinidir}/layers
-         INTERFACE_PATH={toxinidir}/interfaces
          JUJU_REPOSITORY={toxinidir}/build
-passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
+passenv = no_proxy http_proxy https_proxy JUJU_REPOSITORY
 install_command =
   {toxinidir}/pip.sh install {opts} {packages}
 allowlist_externals =
@@ -50,7 +48,7 @@ basepython = python3
 deps = -r{toxinidir}/build-requirements.txt
 commands =
     charmcraft clean
-    charmcraft -v build
+    charmcraft -v pack
     {toxinidir}/rename.sh
 
 [testenv:build-reactive]
@@ -68,31 +66,6 @@ basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
-[testenv:py35]
-basepython = python3.5
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
-[testenv:py36]
-basepython = python3.6
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
-[testenv:py37]
-basepython = python3.7
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
-[testenv:py38]
-basepython = python3.8
-deps = -r{toxinidir}/test-requirements.txt
-commands = stestr run --slowest {posargs}
-
-[testenv:py39]
-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
@@ -101,7 +74,7 @@ commands = stestr run --slowest {posargs}
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2
-       charm-tools==2.8.3
+       git+https://github.com/juju/charm-tools.git
 commands = flake8 {posargs} src unit_tests
 
 [testenv:func-target]