diff --git a/.gitignore b/.gitignore
index d0cd35ce..5a8ce47a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ tags
 .stestr
 func-results.json
 tests/keystone_juju_ca_cert.crt
+*.charm
diff --git a/.gitreview b/.gitreview
index d95aaf65..f01c3467 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@ host=review.opendev.org
 port=29418
 project=openstack/charm-openstack-dashboard.git
 
-defaultbranch=stable/21.10
+defaultbranch=stable/ussuri
diff --git a/.zuul.yaml b/.zuul.yaml
index b3037e94..0eed1965 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,4 @@
 - project:
     templates:
-      - python35-charm-jobs
       - openstack-python3-ussuri-jobs
       - openstack-cover-jobs
diff --git a/build-requirements.txt b/build-requirements.txt
new file mode 100644
index 00000000..b6d2452f
--- /dev/null
+++ b/build-requirements.txt
@@ -0,0 +1,7 @@
+# NOTES(lourot):
+# * We don't install charmcraft via pip anymore because it anyway spins up a
+#   container and scp the system's charmcraft snap inside it. So the charmcraft
+#   snap is necessary on the system anyway.
+# * `tox -e build` successfully validated with charmcraft 1.2.1
+
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index e1bd2f93..c77a05be 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,4 +1,4 @@
-repo: https://github.com/juju/charm-helpers@stable/21.10
+repo: https://github.com/juju/charm-helpers@stable/ussuri
 destination: charmhelpers
 include:
     - core
diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 00000000..0054a6cb
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,36 @@
+type: charm
+
+parts:
+  charm:
+    plugin: dump
+    source: .
+    prime:
+      - actions/*
+      - charmhelpers/*
+      - files/*
+      - hooks/*
+      - lib/*
+      - templates/*
+      - actions.yaml
+      - config.yaml
+      - copyright
+      - hardening.yaml
+      - icon.svg
+      - LICENSE
+      - Makefile
+      - metadata.yaml
+      - README.md
+
+bases:
+  - build-on:
+      - name: ubuntu
+        channel: "18.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "18.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/metadata.yaml b/metadata.yaml
index cf47d8cb..808f6fef 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -10,12 +10,8 @@ tags:
 extra-bindings:
   public:  # Only used to allow specifying a hostname for DNS-HA.
 series:
-- xenial
 - bionic
 - focal
-- groovy
-- hirsute
-- impish
 provides:
   nrpe-external-master:
     interface: nrpe-external-master
diff --git a/osci.yaml b/osci.yaml
index 54fa7810..c2e397af 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,41 +1,25 @@
 - project:
     templates:
-      - charm-unit-jobs
+      - charm-unit-jobs-py36
+      - charm-unit-jobs-py38
     check:
       jobs:
-      - bionic-train-gr
-      - checklist-work-required-xenial-mitaka
-      - checklist-work-required-bionic-queens
-      - bionic-rocky
-      - bionic-stein
-      - bionic-train
-      - bionic-ussuri
-      - focal-ussuri
-      - focal-victoria
-      - focal-wallaby
-      - focal-xena:
-          voting: false
-      - groovy-victoria
-      - hirsute-wallaby
-      - impish-xena:
-          voting: false
+        # gr tests are disabled due to:
+        # https://bugs.launchpad.net/charm-openstack-dashboard/+bug/1951644
+        - bionic-train-gr:
+            voting: false
+        - bionic-train
+        - bionic-ussuri
+        - focal-ussuri
+    vars:
+      needs_charm_build: true
+      charm_build_name: openstack-dashboard
+      build_type: charmcraft
 
-- job:
-    name: checklist-work-required-xenial-mitaka
-    parent: func-target
-    dependencies: &smoke-jobs
-      - bionic-ussuri
-    vars:
-      tox_extra_args: checklist-work-required:xenial-mitaka
-- job:
-    name: checklist-work-required-bionic-queens
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: checklist-work-required:bionic-queens
 - job:
     name: bionic-train-gr
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - bionic-train
     vars:
-      tox_extra_args: vault:bionic-vault dashboard:bionic-queens-cmr-vault
+      tox_extra_args: vault:bionic-vault dashboard:bionic-train-cmr-vault
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 00000000..d0c35c97
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing bad downloaded charm maybe?"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm
diff --git a/test-requirements.txt b/test-requirements.txt
index 0a7e94a0..03968274 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@
 #       requirements.  They are intertwined.  Also, Zaza itself should specify
 #       all of its own requirements and if it doesn't, fix it there.
 #
+pyparsing<3.0.0  # cffi needs pyparsing < 3.0.0.
 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
 
@@ -37,11 +38,12 @@ oslo.utils<=3.41.0;python_version<'3.6'
 
 coverage>=4.5.2
 pyudev              # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
-git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/ussuri#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/ussuri#egg=zaza.openstack
 
 # Needed for charm-glance:
-git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
+git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
+tempest<31.0.0;python_version<'3.8'
 tempest<24.0.0;python_version<'3.6'
 
 croniter            # needed for charm-rabbitmq-server unit tests
diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml
deleted file mode 100644
index 0a2a2897..00000000
--- a/tests/bundles/bionic-queens.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm
-  '2':
-    constraints: virt-type=kvm mem=3072M
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    to:
-      - '1'
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    to:
-      - '2'
diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml
deleted file mode 100644
index 5ade2ac5..00000000
--- a/tests/bundles/bionic-rocky.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm
-  '2':
-    constraints: virt-type=kvm mem=3072M
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-      - '1'
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-    to:
-      - '2'
diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml
deleted file mode 100644
index f9aac194..00000000
--- a/tests/bundles/bionic-stein.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm
-  '2':
-    constraints: virt-type=kvm mem=3072M
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-      - '1'
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-    to:
-      - '2'
diff --git a/tests/bundles/bionic-queens-cmr-vault.yaml b/tests/bundles/bionic-train-cmr-vault.yaml
similarity index 73%
rename from tests/bundles/bionic-queens-cmr-vault.yaml
rename to tests/bundles/bionic-train-cmr-vault.yaml
index 5b02465c..5331bfac 100644
--- a/tests/bundles/bionic-queens-cmr-vault.yaml
+++ b/tests/bundles/bionic-train-cmr-vault.yaml
@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 series: bionic
 
 comment:
@@ -24,24 +26,31 @@ relations:
 
 applications:
   mysql:
-    charm: cs:~openstack-charmers/percona-cluster
+    charm: ch:percona-cluster
     num_units: 1
     to:
       - '0'
+    channel: 5.7/edge
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
+    options:
+      openstack-origin: cloud:bionic-train
     num_units: 1
     to:
       - '1'
+    channel: ussuri/edge
   openstack-dashboard:
-    charm: ../../../openstack-dashboard
+    charm: ../../openstack-dashboard.charm
     num_units: 3
+    options:
+      openstack-origin: cloud:bionic-train
     to:
       - '2'
       - '3'
       - '4'
   hacluster:
-    charm: cs:~openstack-charmers/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: 2.0.3/edge
diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml
index a7b5b269..972b0ae6 100644
--- a/tests/bundles/bionic-train.yaml
+++ b/tests/bundles/bionic-train.yaml
@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 series: bionic
 
 comment:
@@ -19,19 +21,21 @@ relations:
 
 applications:
   mysql:
-    charm: cs:~openstack-charmers/percona-cluster
+    charm: ch:percona-cluster
     num_units: 1
     to:
       - '0'
+    channel: 5.7/edge
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
     to:
       - '1'
+    channel: ussuri/edge
   openstack-dashboard:
-    charm: ../../../openstack-dashboard
+    charm: ../../openstack-dashboard.charm
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml
index 6dfd05ab..3130e8f2 100644
--- a/tests/bundles/bionic-ussuri.yaml
+++ b/tests/bundles/bionic-ussuri.yaml
@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 series: bionic
 
 comment:
@@ -19,19 +21,21 @@ relations:
 
 applications:
   mysql:
-    charm: cs:~openstack-charmers/percona-cluster
+    charm: ch:percona-cluster
     num_units: 1
     to:
       - '0'
+    channel: 5.7/edge
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
     to:
       - '1'
+    channel: ussuri/edge
   openstack-dashboard:
-    charm: ../../../openstack-dashboard
+    charm: ../../openstack-dashboard.charm
     num_units: 1
     options:
       openstack-origin: cloud:bionic-ussuri
diff --git a/tests/bundles/bionic-vault.yaml b/tests/bundles/bionic-vault.yaml
index 14d6b2b0..79ca6055 100644
--- a/tests/bundles/bionic-vault.yaml
+++ b/tests/bundles/bionic-vault.yaml
@@ -1,12 +1,16 @@
+local_overlay_enabled: False
+
 series: bionic
 services:
   vault:
     num_units: 1
     series: bionic
-    charm: cs:~openstack-charmers/vault
+    charm: ch:vault
+    channel: 1.7/edge
   mysql:
-    charm: cs:~openstack-charmers/percona-cluster
+    charm: ch:percona-cluster
     num_units: 1
+    channel: 5.7/edge
 relations:
 - - vault:shared-db
   - mysql:shared-db
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
index 6a055130..b5b08af8 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin distro
 
@@ -22,12 +24,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
   openstack-dashboard-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
+    charm: ch:mysql-router
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -35,17 +39,19 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: 8.0/edge
 
   keystone:
-    charm: cs:~openstack-charmers/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: ussuri/edge
 
   openstack-dashboard:
-    charm: ../../../openstack-dashboard
+    charm: ../../openstack-dashboard.charm
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
deleted file mode 100644
index 612a7e06..00000000
--- a/tests/bundles/focal-victoria.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-victoria
-
-series: focal
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm
-  '4':
-    constraints: virt-type=kvm mem=3072M
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  openstack-dashboard-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml
deleted file mode 100644
index 449e68c0..00000000
--- a/tests/bundles/focal-wallaby.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-wallaby
-
-series: focal
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm
-  '4':
-    constraints: virt-type=kvm mem=3072M
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  openstack-dashboard-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml
deleted file mode 100644
index dc386795..00000000
--- a/tests/bundles/focal-xena.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-xena
-
-series: focal
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm
-  '4':
-    constraints: virt-type=kvm mem=3072M
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  openstack-dashboard-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml
deleted file mode 100644
index 58a3d3ab..00000000
--- a/tests/bundles/groovy-victoria.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: groovy
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm
-  '4':
-    constraints: virt-type=kvm mem=3072M
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  openstack-dashboard-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml
deleted file mode 100644
index fe2d6e6d..00000000
--- a/tests/bundles/hirsute-wallaby.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: hirsute
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm
-  '4':
-    constraints: virt-type=kvm mem=3072M
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  openstack-dashboard-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml
deleted file mode 100644
index 38093260..00000000
--- a/tests/bundles/impish-xena.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: impish
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm mem=3072M
-  '2':
-    constraints: virt-type=kvm mem=3072M
-  '3':
-    constraints: virt-type=kvm
-  '4':
-    constraints: virt-type=kvm mem=3072M
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-  openstack-dashboard-mysql-router:
-    charm: cs:~openstack-charmers/mysql-router
-
-  mysql-innodb-cluster:
-    charm: cs:~openstack-charmers/mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-
-  - - 'openstack-dashboard:identity-service'
-    - 'keystone:identity-service'
diff --git a/tests/bundles/overlays/bionic-queens-cmr-vault.yaml.j2 b/tests/bundles/overlays/bionic-train-cmr-vault.yaml.j2
similarity index 100%
rename from tests/bundles/overlays/bionic-queens-cmr-vault.yaml.j2
rename to tests/bundles/overlays/bionic-train-cmr-vault.yaml.j2
diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml
deleted file mode 100644
index c7bc22fb..00000000
--- a/tests/bundles/xenial-mitaka.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-series: xenial
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm
-  '2':
-    constraints: virt-type=kvm mem=3072M
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    to:
-      - '1'
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    to:
-      - '2'
diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml
deleted file mode 100644
index 3052b075..00000000
--- a/tests/bundles/xenial-queens.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-series: xenial
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-  - 'virt-type=kvm is workaround while awaiting new release of python-libjuju'
-
-machines:
-  '0':
-    constraints: virt-type=kvm mem=3072M
-  '1':
-    constraints: virt-type=kvm
-  '2':
-    constraints: virt-type=kvm mem=3072M
-
-relations:
-  - ["keystone:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:shared-db", "mysql:shared-db"]
-  - ["openstack-dashboard:identity-service", "keystone:identity-service"]
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  keystone:
-    charm: cs:~openstack-charmers/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-    to:
-      - '1'
-  openstack-dashboard:
-    charm: ../../../openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-    to:
-      - '2'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index d732f536..7e339fcf 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -9,24 +9,12 @@ smoke_bundles:
 gate_bundles:
   - bionic-train-gr:
     - vault: bionic-vault
-    - dashboard: bionic-queens-cmr-vault
-  # See bug #1915293 for more details
-  - checklist-work-required: xenial-mitaka
-  - checklist-work-required: xenial-queens
-  - checklist-work-required: bionic-queens
-  - bionic-rocky
-  - bionic-stein
+    - dashboard: bionic-train-cmr-vault
   - bionic-train
   - bionic-ussuri
   - focal-ussuri
-  - focal-victoria
-  - focal-wallaby
-  - groovy-victoria
 
-dev_bundles:
-  - focal-xena
-  - hirsute-wallaby
-  - impish-xena
+dev_bundles: []
 
 configure:
   - vault:
@@ -55,9 +43,7 @@ tests:
 tests_options:
   policyd:
     service: openstack-dashboard
-  force_deploy:
-    - groovy-victoria
-    - impish-xena
+  force_deploy: []
 
 target_deploy_status:
   vault:
diff --git a/tox.ini b/tox.ini
index ba4fd5b6..d99d7183 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,12 +37,22 @@ setenv = VIRTUAL_ENV={envdir}
 install_command =
   {toxinidir}/pip.sh install {opts} {packages}
 commands = stestr run --slowest {posargs}
-allowlist_externals = juju
+allowlist_externals =
+    charmcraft
+    rename.sh
 passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 
-[testenv:py35]
-basepython = python3.5
+[testenv:build]
+basepython = python3
+deps = -r{toxinidir}/build-requirements.txt
+commands =
+    charmcraft clean
+    charmcraft -v build
+    {toxinidir}/rename.sh
+
+[testenv:py3]
+basepython = python3
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
@@ -50,21 +60,31 @@ deps = -r{toxinidir}/requirements.txt
 basepython = python3.6
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:py37]
 basepython = python3.7
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:py38]
 basepython = python3.8
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
-[testenv:py3]
-basepython = python3
+[testenv:py39]
+basepython = python3.9
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
+[testenv:py310]
+basepython = python3.10
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3