diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py
index d5d301e6..9cc96d60 100644
--- a/hooks/charmhelpers/contrib/openstack/utils.py
+++ b/hooks/charmhelpers/contrib/openstack/utils.py
@@ -1413,7 +1413,8 @@ def incomplete_relation_data(configs, required_interfaces):
         for i in incomplete_relations}
 
 
-def do_action_openstack_upgrade(package, upgrade_callback, configs):
+def do_action_openstack_upgrade(package, upgrade_callback, configs,
+                                force_upgrade=False):
     """Perform action-managed OpenStack upgrade.
 
     Upgrades packages to the configured openstack-origin version and sets
@@ -1427,12 +1428,13 @@ def do_action_openstack_upgrade(package, upgrade_callback, configs):
     @param package: package name for determining if upgrade available
     @param upgrade_callback: function callback to charm's upgrade function
     @param configs: templating object derived from OSConfigRenderer class
+    @param force_upgrade: perform dist-upgrade regardless of new openstack
 
     @return: True if upgrade successful; False if upgrade failed or skipped
     """
     ret = False
 
-    if openstack_upgrade_available(package):
+    if openstack_upgrade_available(package) or force_upgrade:
         if config('action-managed-upgrade'):
             juju_log('Upgrading OpenStack release')
 
@@ -2599,6 +2601,23 @@ def get_subordinate_release_packages(os_release, package_type='deb'):
     return SubordinatePackages(install, purge)
 
 
+def get_subordinate_services():
+    """Iterate over subordinate relations and get service information.
+
+    In a similar fashion as with get_subordinate_release_packages(),
+    principle charms can retrieve a list of services advertised by their
+    subordinate charms. This is useful to know about subordinate services when
+    pausing, resuming or upgrading a principle unit.
+
+    :returns: Name of all services advertised by all subordinates
+    :rtype: Set[str]
+    """
+    services = set()
+    for rdata in container_scoped_relation_get('services'):
+        services |= set(json.loads(rdata or '[]'))
+    return services
+
+
 os_restart_on_change = partial(
     pausable_restart_on_change,
     can_restart_now_f=deferred_events.check_and_record_restart_request,
diff --git a/hooks/charmhelpers/contrib/storage/linux/ceph.py b/hooks/charmhelpers/contrib/storage/linux/ceph.py
index 3eb46d70..c70aeb20 100644
--- a/hooks/charmhelpers/contrib/storage/linux/ceph.py
+++ b/hooks/charmhelpers/contrib/storage/linux/ceph.py
@@ -294,7 +294,6 @@ class BasePool(object):
         # NOTE: Do not perform initialization steps that require live data from
         # a running cluster here. The *Pool classes may be used for validation.
         self.service = service
-        self.nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
         self.op = op or {}
 
         if op:
@@ -341,7 +340,8 @@ class BasePool(object):
         Do not add calls for a specific pool type here, those should go into
         one of the pool specific classes.
         """
-        if self.nautilus_or_later:
+        nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
+        if nautilus_or_later:
             # Ensure we set the expected pool ratio
             update_pool(
                 client=self.service,
@@ -660,8 +660,9 @@ class ReplicatedPool(BasePool):
         else:
             self.pg_num = self.get_pgs(self.replicas, self.percent_data)
 
+        nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
         # Create it
-        if self.nautilus_or_later:
+        if nautilus_or_later:
             cmd = [
                 'ceph', '--id', self.service, 'osd', 'pool', 'create',
                 '--pg-num-min={}'.format(
@@ -745,9 +746,9 @@ class ErasurePool(BasePool):
         k = int(erasure_profile['k'])
         m = int(erasure_profile['m'])
         pgs = self.get_pgs(k + m, self.percent_data)
-        self.nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
+        nautilus_or_later = cmp_pkgrevno('ceph-common', '14.2.0') >= 0
         # Create it
-        if self.nautilus_or_later:
+        if nautilus_or_later:
             cmd = [
                 'ceph', '--id', self.service, 'osd', 'pool', 'create',
                 '--pg-num-min={}'.format(
diff --git a/hooks/charmhelpers/core/host_factory/ubuntu.py b/hooks/charmhelpers/core/host_factory/ubuntu.py
index e710c0e0..0906c5c0 100644
--- a/hooks/charmhelpers/core/host_factory/ubuntu.py
+++ b/hooks/charmhelpers/core/host_factory/ubuntu.py
@@ -29,6 +29,7 @@ UBUNTU_RELEASES = (
     'groovy',
     'hirsute',
     'impish',
+    'jammy',
 )
 
 
diff --git a/hooks/charmhelpers/fetch/ubuntu.py b/hooks/charmhelpers/fetch/ubuntu.py
index 6c7cf6fc..cf8328f0 100644
--- a/hooks/charmhelpers/fetch/ubuntu.py
+++ b/hooks/charmhelpers/fetch/ubuntu.py
@@ -275,6 +275,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
     ('groovy', 'victoria'),
     ('hirsute', 'wallaby'),
     ('impish', 'xena'),
+    ('jammy', 'yoga'),
 ])
 
 
diff --git a/lib/charms_ceph/utils.py b/lib/charms_ceph/utils.py
index 9b7299dd..025ab866 100644
--- a/lib/charms_ceph/utils.py
+++ b/lib/charms_ceph/utils.py
@@ -3169,6 +3169,8 @@ UPGRADE_PATHS = collections.OrderedDict([
     ('luminous', 'mimic'),
     ('mimic', 'nautilus'),
     ('nautilus', 'octopus'),
+    ('octopus', 'pacific'),
+    ('pacific', 'quincy'),
 ])
 
 # Map UCA codenames to ceph codenames
@@ -3186,6 +3188,10 @@ UCA_CODENAME_MAP = {
     'stein': 'mimic',
     'train': 'nautilus',
     'ussuri': 'octopus',
+    'victoria': 'octopus',
+    'wallaby': 'pacific',
+    'xena': 'pacific',
+    'yoga': 'quincy',
 }
 
 
diff --git a/metadata.yaml b/metadata.yaml
index 530b7672..7069f780 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -11,7 +11,6 @@ tags:
 - file-servers
 - misc
 series:
-- xenial
 - bionic
 - focal
 - groovy
diff --git a/osci.yaml b/osci.yaml
index 4e322d5e..0b2a0aa5 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,10 +1,10 @@
 - project:
     templates:
-      - charm-unit-jobs
-      - charm-functional-jobs
-    check:
-      jobs:
-        - focal-xena:
-            voting: false
-        - impish-xena:
-            voting: false
+      - charm-yoga-unit-jobs
+      - charm-yoga-functional-jobs
+      - charm-xena-functional-jobs
+      - charm-wallaby-functional-jobs
+      - charm-victoria-functional-jobs
+      - charm-ussuri-functional-jobs
+      - charm-stein-functional-jobs
+      - charm-queens-functional-jobs
diff --git a/test-requirements.txt b/test-requirements.txt
index dba2c767..f853625d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,8 @@
 #       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  # 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
 
 requests>=2.18.4
diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml
new file mode 100644
index 00000000..7beef444
--- /dev/null
+++ b/tests/bundles/focal-yoga.yaml
@@ -0,0 +1,222 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-yoga
+
+series: focal
+
+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':
+  '9':
+  '10':
+  '11':
+  '12':
+  '13':
+  '14':
+  '15':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  placement-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  ceph-osd:
+    charm: ../../../ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      osd-devices: '/dev/test-non-existent'
+      source: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+      source: *openstack-origin
+    to:
+      - '6'
+      - '7'
+      - '8'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '9'
+
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '10'
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '11'
+
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '12'
+
+  cinder:
+    expose: True
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      block-device: 'None'
+      glance-api-version: '2'
+    to:
+      - '13'
+
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+
+  nova-cloud-controller:
+    expose: True
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '14'
+
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '15'
+
+relations:
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-compute:ceph'
+    - 'ceph-mon:client'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'glance:ceph'
+    - 'ceph-mon:client'
+
+  - - 'cinder:shared-db'
+    - 'cinder-mysql-router:shared-db'
+  - - 'cinder-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'cinder:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'cinder:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'cinder:image-service'
+    - 'glance:image-service'
+
+  - - 'cinder-ceph:storage-backend'
+    - 'cinder:storage-backend'
+
+  - - 'cinder-ceph:ceph'
+    - 'ceph-mon:client'
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+
+  - - 'nova-cloud-controller:shared-db'
+    - 'nova-cloud-controller-mysql-router:shared-db'
+  - - 'nova-cloud-controller-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'placement:shared-db'
+    - 'placement-mysql-router:shared-db'
+  - - 'placement-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'placement'
+    - 'keystone'
+
+  - - 'placement'
+    - 'nova-cloud-controller'
+
+  - - 'cinder-ceph:ceph-access'
+    - 'nova-compute:ceph-access'
diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/jammy-yoga.yaml
similarity index 99%
rename from tests/bundles/groovy-victoria.yaml
rename to tests/bundles/jammy-yoga.yaml
index 1d1b1ffb..5a6895cc 100644
--- a/tests/bundles/groovy-victoria.yaml
+++ b/tests/bundles/jammy-yoga.yaml
@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: groovy
+series: jammy
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml
deleted file mode 100644
index 555895d3..00000000
--- a/tests/bundles/trusty-mitaka.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-series: trusty
-applications:
-  ceph-osd:
-    charm: ../../../ceph-osd
-    num_units: 3
-    series: trusty
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/srv/ceph /dev/test-non-existent'
-      source: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-      source: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-  percona-cluster:
-    charm: cs:trusty/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-      source: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-  cinder:
-    expose: True
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  nova-cloud-controller:
-    expose: True
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: cloud:trusty-mitaka
-    # workaround while awaiting release of next version of python-libjuju with
-    # model-constraints support
-    constraints:
-      virt-type=kvm
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - glance:ceph
-  - ceph-mon:client
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:image-service
-  - glance:image-service
-- - cinder-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - nova-cloud-controller:shared-db
-  - percona-cluster:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml
deleted file mode 100644
index 4500ce95..00000000
--- a/tests/bundles/xenial-mitaka.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-series: xenial
-applications:
-  ceph-osd:
-    charm: ../../../ceph-osd
-    num_units: 3
-    series: xenial
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/srv/ceph /dev/test-non-existent'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-  cinder:
-    expose: True
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  nova-cloud-controller:
-    expose: True
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - glance:ceph
-  - ceph-mon:client
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:image-service
-  - glance:image-service
-- - cinder-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - nova-cloud-controller:shared-db
-  - percona-cluster:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
deleted file mode 100644
index ef2bfb54..00000000
--- a/tests/bundles/xenial-ocata.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-series: xenial
-applications:
-  ceph-osd:
-    charm: ../../../ceph-osd
-    num_units: 3
-    series: xenial
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/srv/ceph /dev/test-non-existent'
-      source: cloud:xenial-ocata
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-      source: cloud:xenial-ocata
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-      source: cloud:xenial-ocata
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: cloud:xenial-ocata
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-ocata
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-ocata
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-ocata
-  cinder:
-    expose: True
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: cloud:xenial-ocata
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  nova-cloud-controller:
-    expose: True
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-ocata
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - glance:ceph
-  - ceph-mon:client
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:image-service
-  - glance:image-service
-- - cinder-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - nova-cloud-controller:shared-db
-  - percona-cluster:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml
deleted file mode 100644
index 2874cfe4..00000000
--- a/tests/bundles/xenial-pike.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-series: xenial
-applications:
-  ceph-osd:
-    charm: ../../../ceph-osd
-    num_units: 3
-    series: xenial
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/srv/ceph /dev/test-non-existent'
-      source: cloud:xenial-pike
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-      source: cloud:xenial-pike
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-      source: cloud:xenial-pike
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: cloud:xenial-pike
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-pike
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-pike
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-pike
-  cinder:
-    expose: True
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: cloud:xenial-pike
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  nova-cloud-controller:
-    expose: True
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-pike
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - glance:ceph
-  - ceph-mon:client
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:image-service
-  - glance:image-service
-- - cinder-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - nova-cloud-controller:shared-db
-  - percona-cluster:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml
deleted file mode 100644
index 8c5a762a..00000000
--- a/tests/bundles/xenial-queens.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-series: xenial
-applications:
-  ceph-osd:
-    charm: ../../../ceph-osd
-    num_units: 3
-    series: xenial
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/srv/ceph /dev/test-non-existent'
-      source: cloud:xenial-queens
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-      auth-supported: 'none'
-      source: cloud:xenial-queens
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 25%
-      max-connections: 1000
-      source: cloud:xenial-queens
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: cloud:xenial-queens
-  keystone:
-    expose: True
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-  nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-  glance:
-    expose: True
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-  cinder:
-    expose: True
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      block-device: 'None'
-      glance-api-version: '2'
-      openstack-origin: cloud:xenial-queens
-  cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
-  nova-cloud-controller:
-    expose: True
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: cloud:xenial-queens
-relations:
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - keystone:shared-db
-  - percona-cluster:shared-db
-- - glance:shared-db
-  - percona-cluster:shared-db
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - glance:ceph
-  - ceph-mon:client
-- - cinder:shared-db
-  - percona-cluster:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:image-service
-  - glance:image-service
-- - cinder-ceph:storage-backend
-  - cinder:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - nova-cloud-controller:shared-db
-  - percona-cluster:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:cloud-compute
-  - nova-compute:cloud-compute
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 1938e14b..de4d04a8 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,28 +1,24 @@
 charm_name: ceph-osd
 
 gate_bundles:
-  - groovy-victoria
-  - focal-xena
-  - focal-wallaby
-  - focal-victoria
-  - focal-ussuri
-  - bionic-ussuri
-  - bionic-train
-  - bionic-stein
   - bionic-queens
-  - xenial-mitaka
-
-dev_bundles:
-  - trusty-mitaka
-  - xenial-ocata
-  - xenial-pike
-  - xenial-queens
-  - bionic-rocky
+  - bionic-stein
+  - bionic-ussuri
+  - focal-ussuri
+  - focal-victoria
+  - focal-wallaby
+  - focal-xena
   - hirsute-wallaby
   - impish-xena
 
-smoke_bundles:
+dev_bundles:
+  - bionic-rocky
   - bionic-train
+  - focal-yoga
+  - jammy-yoga
+
+smoke_bundles:
+  - focal-ussuri
 
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
@@ -36,7 +32,6 @@ tests:
 
 tests_options:
   force_deploy:
-    - trusty-mitaka
-    - groovy-victoria
     - hirsute-wallaby
     - impish-xena
+    - jammy-yoga
diff --git a/tox.ini b/tox.ini
index ba4fd5b6..86d1e904 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,6 +61,11 @@ basepython = python3.8
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
+
 [testenv:py3]
 basepython = python3
 deps = -r{toxinidir}/requirements.txt