diff --git a/.gitignore b/.gitignore
index 1a6bf6b..9fc3311 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@
 *__pycache__*
 *.pyc
 build
-*.charmt
+*.charm
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 2459a54..6703d0e 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -20,7 +20,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 be3022d..d36c624 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/requirements.txt b/requirements.txt
index a68620f..7755b95 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,9 +8,16 @@
 # requirements.txt
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
+# 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
+
 # Build requirements
 cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
-charm-tools==2.8.3
+git+https://github.com/juju/charm-tools#egg=charm-tools
 
 simplejson
 
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 71f3cce..50f02b6 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -7,7 +7,7 @@ tags:
 - openstack
 series:
 - focal
-- impish
+- jammy
 subordinate: true
 requires:
   juju-info:
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index e551448..8842706 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -9,15 +9,14 @@ pyrsistent<0.18.0
 # layer-basic requires setuptools<42, zipp>=2.0.0 requires setuptools>42
 # LP: #1862186
 zipp < 2.0.0
-# Pin setuptools as tactical fix for LP: 1855766. Can be removed when
-# https://github.com/juju-solutions/layer-basic/issues/149 is fixed
-setuptools < 42.0.0
 # cryptography 3.4 introduces a requirement for rust code in the module.  As it has to be compiled
 # on the machine during install, this breaks installs.  Instead pin to <3.4 until a solution can be
 # found that doesn't require compiling on the target machine.
 # LP: #1915171
 cryptography<3.4
 
+setuptools < 50.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/tox.ini b/tox.ini
index 2d60b8a..e22fe48 100644
--- a/tox.ini
+++ b/tox.ini
@@ -68,21 +68,11 @@ 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
@@ -93,6 +83,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