diff --git a/osci.yaml b/osci.yaml
index 7bb2879d..49fe1809 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,75 +1,27 @@
 - semaphore:
     name: distro-regression
     max: 2
-- semaphore:
-    name: security-distro-regression
-    max: 2
 - project:
     periodic-weekly:
       jobs:
-      - cot_distro-regression_bionic-queens:
-          branches:
-            - master
-      - cot_distro-regression_bionic-rocky:
-          branches:
-            - master
-      - cot_distro-regression_bionic-stein:
-          branches:
-            - master
-      - cot_distro-regression_bionic-train:
-          branches:
-            - master
-      - cot_distro-regression_bionic-ussuri:
-          branches:
-            - master
-      - cot_distro-regression_focal-ussuri:
-          branches:
-            - master
-      - cot_distro-regression_focal-ussuri-ovn-22.03:
-          branches:
-            - master
-      - cot_distro-regression_focal-victoria:
-          branches:
-            - master
-      - cot_distro-regression_focal-wallaby:
-          branches:
-            - master
-      - cot_distro-regression_focal-xena:
-          branches:
-            - master
-      - cot_distro-regression_focal-yoga:
-          branches:
-            - master
-      - cot_distro-regression_jammy-yoga:
-          branches:
-            - master
-      - cot_distro-regression_jammy-zed:
-          branches:
-            - master
-      - cot_distro-regression_jammy-antelope:
-          branches:
-            - master
-      - cot_distro-regression_jammy-bobcat:
-          branches:
-            - master
-      - cot_distro-regression_lunar-antelope:
-          branches:
-            - master
-      - cot_distro-regression_mantic-bobcat:
-          branches:
-            - master
-      - cot_distro-regression_bionic-queens-security:
-          branches:
-            - master
-      - cot_distro-regression_focal-ussuri-security:
-          branches:
-            - master
-      - cot_distro-regression_jammy-yoga-security:
-          branches:
-            - master
-      - cot_distro-regression_lunar-antelope-security:
-          branches:
-            - master
+      - cot_distro-regression_bionic-queens
+      - cot_distro-regression_bionic-ussuri
+      - cot_distro-regression_focal-ussuri
+      - cot_distro-regression_focal-ussuri-ovn-22.03
+      - cot_distro-regression_focal-victoria
+      - cot_distro-regression_focal-wallaby
+      - cot_distro-regression_focal-xena
+      - cot_distro-regression_focal-yoga
+      - cot_distro-regression_jammy-yoga
+      - cot_distro-regression_jammy-zed
+      - cot_distro-regression_jammy-antelope
+      - cot_distro-regression_jammy-bobcat
+      - cot_distro-regression_lunar-antelope
+      - cot_distro-regression_mantic-bobcat
+      - cot_distro-regression_bionic-queens-security
+      - cot_distro-regression_focal-ussuri-security
+      - cot_distro-regression_jammy-yoga-security
+      - cot_distro-regression_lunar-antelope-security
 - job:
     name: cot-func-target
     parent: func-target
@@ -80,21 +32,6 @@
     parent: cot-func-target
     vars:
       tox_extra_args: '-- bionic-queens'
-- job:
-    name: cot_distro-regression_bionic-rocky
-    parent: cot-func-target
-    vars:
-      tox_extra_args: '-- bionic-rocky'
-- job:
-    name: cot_distro-regression_bionic-stein
-    parent: cot-func-target
-    vars:
-      tox_extra_args: '-- bionic-stein'
-- job:
-    name: cot_distro-regression_bionic-train
-    parent: cot-func-target
-    vars:
-      tox_extra_args: '-- bionic-train'
 - job:
     name: cot_distro-regression_bionic-ussuri
     parent: cot-func-target
diff --git a/tests/distro-regression/tests/bundles/bionic-rocky.yaml b/tests/distro-regression/tests/bundles/bionic-rocky.yaml
deleted file mode 100644
index d2ca1a81..00000000
--- a/tests/distro-regression/tests/bundles/bionic-rocky.yaml
+++ /dev/null
@@ -1,394 +0,0 @@
-variables:
-  source: &source cloud:bionic-rocky/proposed
-  openstack-origin: &openstack-origin cloud:bionic-rocky/proposed
-  retrofit-uca-pocket: &retrofit-uca-pocket rocky
-
-series: &series bionic
-applications:
-  aodh:
-    charm: ch:aodh
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  barbican:
-    charm: ch:barbican
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  ceilometer:
-    charm: ch:ceilometer
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  ceilometer-agent:
-    charm: ch:ceilometer-agent
-    channel: rocky/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      expected-osd-count: 3
-      source: *source
-    constraints: mem=1024
-    channel: mimic/edge
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: cinder,24G
-    constraints: mem=4096
-    channel: mimic/edge
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      block-device: None
-      glance-api-version: 2
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  cinder-ceph:
-    charm: ch:cinder-ceph
-    channel: rocky/edge
-  designate:
-    charm: ch:designate
-    num_units: 1
-    options:
-      nameservers: ns1.ubuntu.com.
-      neutron-domain: serverstack.ubuntu.com.
-      neutron-domain-email: bob@serverstack.ubuntu.com
-      nova-domain: serverstack.ubuntu.com.
-      nova-domain-email: bob@serverstack.ubuntu.com
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  designate-bind:
-    charm: ch:designate-bind
-    num_units: 1
-    channel: rocky/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  gnocchi:
-    charm: ch:gnocchi
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: rocky/edge
-  heat:
-    charm: ch:heat
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: rocky/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  memcached:
-    charm: ch:memcached
-    num_units: 1
-    constraints: mem=1024
-    channel: latest/edge
-  mysql:
-    charm: ch:percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 50%
-      max-connections: 20000
-      root-password: ChangeMe123
-      source: *source
-      sst-password: ChangeMe123
-    constraints: mem=4096
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      enable-ml2-port-security: true
-      enable-qos: true
-      enable-vlan-trunking: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      instance-mtu: 1300
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: rocky/edge
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: rocky/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: rocky/edge
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 3
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: rocky/edge
-  openstack-dashboard:
-    charm: ch:openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: rocky/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-    constraints: mem=1024
-    channel: 3.8/edge
-  swift-proxy:
-    charm: ch:swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      replicas: 3
-      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-      zone-assignment: manual
-    constraints: mem=1024
-    channel: rocky/edge
-  swift-storage-z1:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: rocky/edge
-  swift-storage-z2:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 2
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: rocky/edge
-  swift-storage-z3:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 3
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: rocky/edge
-  neutron-openvswitch-octavia:
-    charm: ch:neutron-openvswitch
-    num_units: 0
-    options:
-      debug: True
-      prevent-arp-spoofing: False
-      firewall-driver: openvswitch
-    channel: rocky/edge
-  octavia:
-    charm: ch:octavia
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      spare-pool-size: 2
-      loadbalancer-topology: 'ACTIVE_STANDBY'
-    channel: rocky/edge
-  glance-simplestreams-sync:
-    charm: ch:glance-simplestreams-sync
-    num_units: 1
-    options:
-      use_swift: true
-    constraints: root-disk=8G
-    channel: rocky/edge
-  octavia-diskimage-retrofit:
-    charm: ch:octavia-diskimage-retrofit
-    options:
-      amp-image-tag: 'octavia-amphora'
-      retrofit-series: *series
-      retrofit-uca-pocket: *retrofit-uca-pocket
-    channel: rocky/edge
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - cinder:shared-db
-  - mysql:shared-db
-- - heat:shared-db
-  - mysql:shared-db
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-compute:cloud-compute
-  - nova-cloud-controller:cloud-compute
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:ceph
-  - ceph-mon:client
-- - glance:image-service
-  - cinder:image-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - neutron-gateway:quantum-network-service
-  - nova-cloud-controller:quantum-network-service
-- - openstack-dashboard:identity-service
-  - keystone:identity-service
-- - swift-proxy:identity-service
-  - keystone:identity-service
-- - swift-proxy:swift-storage
-  - swift-storage-z1:swift-storage
-- - swift-proxy:swift-storage
-  - swift-storage-z2:swift-storage
-- - swift-proxy:swift-storage
-  - swift-storage-z3:swift-storage
-- - ceilometer:identity-service
-  - keystone:identity-service
-- - ceilometer:amqp
-  - rabbitmq-server:amqp
-- - ceilometer-agent:nova-ceilometer
-  - nova-compute:nova-ceilometer
-- - ceilometer-agent:ceilometer-service
-  - ceilometer:ceilometer-service
-- - ceilometer-agent:amqp
-  - rabbitmq-server:amqp
-- - heat:identity-service
-  - keystone:identity-service
-- - heat:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:neutron-api
-  - nova-cloud-controller:neutron-api
-- - neutron-api:neutron-plugin-api
-  - neutron-openvswitch:neutron-plugin-api
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:neutron-plugin-api
-  - neutron-gateway:neutron-plugin-api
-- - neutron-openvswitch:neutron-plugin
-  - nova-compute:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server:amqp
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - aodh:shared-db
-  - mysql:shared-db
-- - designate:shared-db
-  - mysql:shared-db
-- - aodh:amqp
-  - rabbitmq-server:amqp
-- - aodh:identity-service
-  - keystone:identity-service
-- - designate:identity-service
-  - keystone:identity-service
-- - designate:amqp
-  - rabbitmq-server:amqp
-- - designate:dns-backend
-  - designate-bind:dns-backend
-- - designate:coordinator-memcached
-  - memcached:cache
-- - gnocchi:shared-db
-  - mysql:shared-db
-- - gnocchi:storage-ceph
-  - ceph-mon:client
-- - gnocchi:amqp
-  - rabbitmq-server:amqp
-- - gnocchi:coordinator-memcached
-  - memcached:cache
-- - gnocchi:metric-service
-  - ceilometer:metric-service
-- - gnocchi:identity-service
-  - keystone:identity-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
-- - ceilometer:identity-credentials
-  - keystone:identity-credentials
-- - designate:dnsaas
-  - neutron-api:external-dns
-- - barbican:shared-db
-  - mysql:shared-db
-- - barbican:amqp
-  - rabbitmq-server:amqp
-- - barbican:identity-service
-  - keystone:identity-service
-- - mysql:shared-db
-  - octavia:shared-db
-- - keystone:identity-service
-  - octavia:identity-service
-- - rabbitmq-server:amqp
-  - octavia:amqp
-- - neutron-api:neutron-load-balancer
-  - octavia:neutron-api
-- - rabbitmq-server:amqp
-  - neutron-openvswitch-octavia:amqp
-- - neutron-api:neutron-plugin-api
-  - neutron-openvswitch-octavia:neutron-plugin-api
-- - neutron-openvswitch-octavia:neutron-plugin
-  - octavia:neutron-openvswitch
-- - glance-simplestreams-sync:juju-info
-  - octavia-diskimage-retrofit:juju-info
-- - keystone:identity-service
-  - glance-simplestreams-sync:identity-service
-- - keystone:identity-credentials
-  - octavia-diskimage-retrofit:identity-credentials
diff --git a/tests/distro-regression/tests/bundles/bionic-stein.yaml b/tests/distro-regression/tests/bundles/bionic-stein.yaml
deleted file mode 100644
index d69f2c3c..00000000
--- a/tests/distro-regression/tests/bundles/bionic-stein.yaml
+++ /dev/null
@@ -1,394 +0,0 @@
-variables:
-  source: &source cloud:bionic-stein/proposed
-  openstack-origin: &openstack-origin cloud:bionic-stein/proposed
-  retrofit-uca-pocket: &retrofit-uca-pocket stein
-
-series: &series bionic
-applications:
-  aodh:
-    charm: ch:aodh
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  barbican:
-    charm: ch:barbican
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  ceilometer:
-    charm: ch:ceilometer
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  ceilometer-agent:
-    charm: ch:ceilometer-agent
-    channel: stein/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      expected-osd-count: 3
-      source: *source
-    constraints: mem=1024
-    channel: octopus/edge
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: cinder,24G
-    constraints: mem=4096
-    channel: octopus/edge
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      block-device: None
-      glance-api-version: 2
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  cinder-ceph:
-    charm: ch:cinder-ceph
-    channel: stein/edge
-  designate:
-    charm: ch:designate
-    num_units: 1
-    options:
-      nameservers: ns1.ubuntu.com.
-      neutron-domain: serverstack.ubuntu.com.
-      neutron-domain-email: bob@serverstack.ubuntu.com
-      nova-domain: serverstack.ubuntu.com.
-      nova-domain-email: bob@serverstack.ubuntu.com
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  designate-bind:
-    charm: ch:designate-bind
-    num_units: 1
-    channel: stein/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  gnocchi:
-    charm: ch:gnocchi
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: stein/edge
-  heat:
-    charm: ch:heat
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: stein/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  memcached:
-    charm: ch:memcached
-    num_units: 1
-    constraints: mem=1024
-    channel: latest/edge
-  mysql:
-    charm: ch:percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 50%
-      max-connections: 20000
-      root-password: ChangeMe123
-      source: *source
-      sst-password: ChangeMe123
-    constraints: mem=4096
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      enable-ml2-port-security: true
-      enable-qos: true
-      enable-vlan-trunking: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      instance-mtu: 1300
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: stein/edge
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: stein/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: stein/edge
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 3
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: stein/edge
-  openstack-dashboard:
-    charm: ch:openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: stein/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-    constraints: mem=1024
-    channel: 3.8/edge
-  swift-proxy:
-    charm: ch:swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      replicas: 3
-      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-      zone-assignment: manual
-    constraints: mem=1024
-    channel: stein/edge
-  swift-storage-z1:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: stein/edge
-  swift-storage-z2:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 2
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: stein/edge
-  swift-storage-z3:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 3
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: stein/edge
-  neutron-openvswitch-octavia:
-    charm: ch:neutron-openvswitch
-    num_units: 0
-    options:
-      debug: True
-      prevent-arp-spoofing: False
-      firewall-driver: openvswitch
-    channel: stein/edge
-  octavia:
-    charm: ch:octavia
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      spare-pool-size: 2
-      loadbalancer-topology: 'ACTIVE_STANDBY'
-    channel: stein/edge
-  glance-simplestreams-sync:
-    charm: ch:glance-simplestreams-sync
-    num_units: 1
-    options:
-      use_swift: true
-    constraints: root-disk=8G
-    channel: stein/edge
-  octavia-diskimage-retrofit:
-    charm: ch:octavia-diskimage-retrofit
-    options:
-      amp-image-tag: 'octavia-amphora'
-      retrofit-series: *series
-      retrofit-uca-pocket: *retrofit-uca-pocket
-    channel: stein/edge
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - cinder:shared-db
-  - mysql:shared-db
-- - heat:shared-db
-  - mysql:shared-db
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-compute:cloud-compute
-  - nova-cloud-controller:cloud-compute
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:ceph
-  - ceph-mon:client
-- - glance:image-service
-  - cinder:image-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - neutron-gateway:quantum-network-service
-  - nova-cloud-controller:quantum-network-service
-- - openstack-dashboard:identity-service
-  - keystone:identity-service
-- - swift-proxy:identity-service
-  - keystone:identity-service
-- - swift-proxy:swift-storage
-  - swift-storage-z1:swift-storage
-- - swift-proxy:swift-storage
-  - swift-storage-z2:swift-storage
-- - swift-proxy:swift-storage
-  - swift-storage-z3:swift-storage
-- - ceilometer:identity-service
-  - keystone:identity-service
-- - ceilometer:amqp
-  - rabbitmq-server:amqp
-- - ceilometer-agent:nova-ceilometer
-  - nova-compute:nova-ceilometer
-- - ceilometer-agent:ceilometer-service
-  - ceilometer:ceilometer-service
-- - ceilometer-agent:amqp
-  - rabbitmq-server:amqp
-- - heat:identity-service
-  - keystone:identity-service
-- - heat:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:neutron-api
-  - nova-cloud-controller:neutron-api
-- - neutron-api:neutron-plugin-api
-  - neutron-openvswitch:neutron-plugin-api
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:neutron-plugin-api
-  - neutron-gateway:neutron-plugin-api
-- - neutron-openvswitch:neutron-plugin
-  - nova-compute:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server:amqp
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - aodh:shared-db
-  - mysql:shared-db
-- - designate:shared-db
-  - mysql:shared-db
-- - aodh:amqp
-  - rabbitmq-server:amqp
-- - aodh:identity-service
-  - keystone:identity-service
-- - designate:identity-service
-  - keystone:identity-service
-- - designate:amqp
-  - rabbitmq-server:amqp
-- - designate:dns-backend
-  - designate-bind:dns-backend
-- - designate:coordinator-memcached
-  - memcached:cache
-- - gnocchi:shared-db
-  - mysql:shared-db
-- - gnocchi:storage-ceph
-  - ceph-mon:client
-- - gnocchi:amqp
-  - rabbitmq-server:amqp
-- - gnocchi:coordinator-memcached
-  - memcached:cache
-- - gnocchi:metric-service
-  - ceilometer:metric-service
-- - gnocchi:identity-service
-  - keystone:identity-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
-- - ceilometer:identity-credentials
-  - keystone:identity-credentials
-- - designate:dnsaas
-  - neutron-api:external-dns
-- - barbican:shared-db
-  - mysql:shared-db
-- - barbican:amqp
-  - rabbitmq-server:amqp
-- - barbican:identity-service
-  - keystone:identity-service
-- - mysql:shared-db
-  - octavia:shared-db
-- - keystone:identity-service
-  - octavia:identity-service
-- - rabbitmq-server:amqp
-  - octavia:amqp
-- - neutron-api:neutron-load-balancer
-  - octavia:neutron-api
-- - rabbitmq-server:amqp
-  - neutron-openvswitch-octavia:amqp
-- - neutron-api:neutron-plugin-api
-  - neutron-openvswitch-octavia:neutron-plugin-api
-- - neutron-openvswitch-octavia:neutron-plugin
-  - octavia:neutron-openvswitch
-- - glance-simplestreams-sync:juju-info
-  - octavia-diskimage-retrofit:juju-info
-- - keystone:identity-service
-  - glance-simplestreams-sync:identity-service
-- - keystone:identity-credentials
-  - octavia-diskimage-retrofit:identity-credentials
diff --git a/tests/distro-regression/tests/bundles/bionic-train.yaml b/tests/distro-regression/tests/bundles/bionic-train.yaml
deleted file mode 100644
index cb99b515..00000000
--- a/tests/distro-regression/tests/bundles/bionic-train.yaml
+++ /dev/null
@@ -1,407 +0,0 @@
-variables:
-  source: &source cloud:bionic-train/proposed
-  openstack-origin: &openstack-origin cloud:bionic-train/proposed
-  retrofit-uca-pocket: &retrofit-uca-pocket train
-
-series: &series bionic
-applications:
-  aodh:
-    charm: ch:aodh
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  barbican:
-    charm: ch:barbican
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  ceilometer:
-    charm: ch:ceilometer
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  ceilometer-agent:
-    charm: ch:ceilometer-agent
-    channel: train/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      expected-osd-count: 3
-      source: *source
-    constraints: mem=1024
-    channel: nautilus/edge
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    options:
-      source: *source
-    storage:
-      osd-devices: cinder,24G
-    constraints: mem=4096
-    channel: nautilus/edge
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    options:
-      block-device: None
-      glance-api-version: 2
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  cinder-ceph:
-    charm: ch:cinder-ceph
-    channel: train/edge
-  designate:
-    charm: ch:designate
-    num_units: 1
-    options:
-      nameservers: ns1.ubuntu.com.
-      neutron-domain: serverstack.ubuntu.com.
-      neutron-domain-email: bob@serverstack.ubuntu.com
-      nova-domain: serverstack.ubuntu.com.
-      nova-domain-email: bob@serverstack.ubuntu.com
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  designate-bind:
-    charm: ch:designate-bind
-    num_units: 1
-    channel: train/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  gnocchi:
-    charm: ch:gnocchi
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: train/edge
-  heat:
-    charm: ch:heat
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: train/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  memcached:
-    charm: ch:memcached
-    num_units: 1
-    constraints: mem=1024
-    channel: latest/edge
-  mysql:
-    charm: ch:percona-cluster
-    num_units: 1
-    options:
-      dataset-size: 50%
-      max-connections: 20000
-      root-password: ChangeMe123
-      source: *source
-      sst-password: ChangeMe123
-    constraints: mem=4096
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      enable-ml2-port-security: true
-      enable-qos: true
-      enable-vlan-trunking: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      bridge-mappings: physnet1:br-ex
-      instance-mtu: 1300
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: train/edge
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: train/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: train/edge
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 3
-    options:
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    constraints: mem=4096
-    channel: train/edge
-  openstack-dashboard:
-    charm: ch:openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    constraints: mem=1024
-    channel: train/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *source
-    constraints: mem=1024
-    channel: 3.8/edge
-  swift-proxy:
-    charm: ch:swift-proxy
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      replicas: 3
-      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-      zone-assignment: manual
-    constraints: mem=1024
-    channel: train/edge
-  swift-storage-z1:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 1
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: train/edge
-  swift-storage-z2:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 2
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: train/edge
-  swift-storage-z3:
-    charm: ch:swift-storage
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      zone: 3
-    storage:
-      block-devices: cinder,10G
-    constraints: mem=1024
-    channel: train/edge
-  neutron-openvswitch-octavia:
-    charm: ch:neutron-openvswitch
-    num_units: 0
-    options:
-      debug: True
-      prevent-arp-spoofing: False
-      firewall-driver: openvswitch
-    channel: train/edge
-  octavia:
-    charm: ch:octavia
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      spare-pool-size: 2
-      loadbalancer-topology: 'ACTIVE_STANDBY'
-    channel: train/edge
-  glance-simplestreams-sync:
-    charm: ch:glance-simplestreams-sync
-    num_units: 1
-    options:
-      use_swift: true
-    constraints: root-disk=8G
-    channel: train/edge
-  octavia-diskimage-retrofit:
-    charm: ch:octavia-diskimage-retrofit
-    options:
-      amp-image-tag: 'octavia-amphora'
-      retrofit-series: *series
-      retrofit-uca-pocket: *retrofit-uca-pocket
-    channel: train/edge
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:shared-db
-  - mysql:shared-db
-- - glance:shared-db
-  - mysql:shared-db
-- - cinder:shared-db
-  - mysql:shared-db
-- - heat:shared-db
-  - mysql:shared-db
-- - neutron-api:shared-db
-  - mysql:shared-db
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - nova-compute:cloud-compute
-  - nova-cloud-controller:cloud-compute
-- - nova-compute:amqp
-  - rabbitmq-server:amqp
-- - nova-compute:image-service
-  - glance:image-service
-- - nova-compute:ceph
-  - ceph-mon:client
-- - glance:identity-service
-  - keystone:identity-service
-- - glance:ceph
-  - ceph-mon:client
-- - glance:image-service
-  - cinder:image-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:storage-backend
-  - cinder-ceph:storage-backend
-- - cinder-ceph:ceph
-  - ceph-mon:client
-- - neutron-gateway:quantum-network-service
-  - nova-cloud-controller:quantum-network-service
-- - openstack-dashboard:identity-service
-  - keystone:identity-service
-- - swift-proxy:identity-service
-  - keystone:identity-service
-- - swift-proxy:swift-storage
-  - swift-storage-z1:swift-storage
-- - swift-proxy:swift-storage
-  - swift-storage-z2:swift-storage
-- - swift-proxy:swift-storage
-  - swift-storage-z3:swift-storage
-- - ceilometer:identity-service
-  - keystone:identity-service
-- - ceilometer:amqp
-  - rabbitmq-server:amqp
-- - ceilometer-agent:nova-ceilometer
-  - nova-compute:nova-ceilometer
-- - ceilometer-agent:ceilometer-service
-  - ceilometer:ceilometer-service
-- - ceilometer-agent:amqp
-  - rabbitmq-server:amqp
-- - heat:identity-service
-  - keystone:identity-service
-- - heat:amqp
-  - rabbitmq-server:amqp
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:amqp
-  - rabbitmq-server:amqp
-- - neutron-api:neutron-api
-  - nova-cloud-controller:neutron-api
-- - neutron-api:neutron-plugin-api
-  - neutron-openvswitch:neutron-plugin-api
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:neutron-plugin-api
-  - neutron-gateway:neutron-plugin-api
-- - neutron-openvswitch:neutron-plugin
-  - nova-compute:neutron-plugin
-- - neutron-openvswitch:amqp
-  - rabbitmq-server:amqp
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - aodh:shared-db
-  - mysql:shared-db
-- - designate:shared-db
-  - mysql:shared-db
-- - aodh:amqp
-  - rabbitmq-server:amqp
-- - aodh:identity-service
-  - keystone:identity-service
-- - designate:identity-service
-  - keystone:identity-service
-- - designate:amqp
-  - rabbitmq-server:amqp
-- - designate:dns-backend
-  - designate-bind:dns-backend
-- - designate:coordinator-memcached
-  - memcached:cache
-- - gnocchi:shared-db
-  - mysql:shared-db
-- - gnocchi:storage-ceph
-  - ceph-mon:client
-- - gnocchi:amqp
-  - rabbitmq-server:amqp
-- - gnocchi:coordinator-memcached
-  - memcached:cache
-- - gnocchi:metric-service
-  - ceilometer:metric-service
-- - gnocchi:identity-service
-  - keystone:identity-service
-- - cinder-ceph:ceph-access
-  - nova-compute:ceph-access
-- - ceilometer:identity-credentials
-  - keystone:identity-credentials
-- - designate:dnsaas
-  - neutron-api:external-dns
-- - barbican:shared-db
-  - mysql:shared-db
-- - barbican:amqp
-  - rabbitmq-server:amqp
-- - barbican:identity-service
-  - keystone:identity-service
-- - placement:identity-service
-  - keystone:identity-service
-- - placement:placement
-  - nova-cloud-controller:placement
-- - placement:shared-db
-  - mysql:shared-db
-- - mysql:shared-db
-  - octavia:shared-db
-- - keystone:identity-service
-  - octavia:identity-service
-- - rabbitmq-server:amqp
-  - octavia:amqp
-- - neutron-api:neutron-load-balancer
-  - octavia:neutron-api
-- - rabbitmq-server:amqp
-  - neutron-openvswitch-octavia:amqp
-- - neutron-api:neutron-plugin-api
-  - neutron-openvswitch-octavia:neutron-plugin-api
-- - neutron-openvswitch-octavia:neutron-plugin
-  - octavia:neutron-openvswitch
-- - glance-simplestreams-sync:juju-info
-  - octavia-diskimage-retrofit:juju-info
-- - keystone:identity-service
-  - glance-simplestreams-sync:identity-service
-- - keystone:identity-credentials
-  - octavia-diskimage-retrofit:identity-credentials
diff --git a/tests/distro-regression/tests/tests.yaml b/tests/distro-regression/tests/tests.yaml
index 41e89d31..8666321a 100644
--- a/tests/distro-regression/tests/tests.yaml
+++ b/tests/distro-regression/tests/tests.yaml
@@ -1,28 +1,25 @@
 smoke_bundles:
-  - keystone_v3_smoke: bionic-queens
-  - keystone_v3_smoke_rocky: bionic-rocky
-  - keystone_v3_smoke_stein: bionic-stein
-  - keystone_v3_smoke_stein: bionic-train
-  - keystone_v3_smoke_stein: bionic-ussuri
-  - keystone_v3_smoke_focal: focal-ussuri
-  - keystone_v3_smoke_focal: focal-ussuri-ovn-22.03
-  - keystone_v3_smoke_focal: focal-victoria
-  - keystone_v3_smoke_focal: focal-wallaby
-  - keystone_v3_smoke_focal: focal-xena
-  - keystone_v3_smoke_focal: focal-yoga
-  - keystone_v3_smoke_focal: jammy-yoga
-  - keystone_v3_smoke_focal: jammy-zed
-  - keystone_v3_smoke_focal: jammy-antelope
-  - keystone_v3_smoke_focal: jammy-bobcat
-  - keystone_v3_smoke_focal: lunar-antelope
-  - keystone_v3_smoke_focal: mantic-bobcat
-  - keystone_v3_smoke_security: bionic-queens-security
-  - keystone_v3_smoke_focal_security: focal-ussuri-security
-  - keystone_v3_smoke_focal_security: jammy-yoga-security
-  - keystone_v3_smoke_focal_security: lunar-antelope-security
-  - keystone_v3_smoke_focal_security: mantic-bobcat-security
+  - keystone_bionic_queens: bionic-queens
+  - keystone_bionic_ussuri: bionic-ussuri
+  - keystone_focal_ussuri: focal-ussuri
+  - keystone_focal_ussuri: focal-ussuri-ovn-22.03
+  - keystone_focal_ussuri: focal-victoria
+  - keystone_focal_wallaby: focal-wallaby
+  - keystone_focal_wallaby: focal-xena
+  - keystone_focal_wallaby: focal-yoga
+  - keystone_focal_wallaby: jammy-yoga
+  - keystone_focal_wallaby: jammy-zed
+  - keystone_focal_wallaby: jammy-antelope
+  - keystone_focal_wallaby: jammy-bobcat
+  - keystone_focal_wallaby: lunar-antelope
+  - keystone_focal_wallaby: mantic-bobcat
+  - keystone_bionic_queens_security: bionic-queens-security
+  - keystone_focal_ussuri_security: focal-ussuri-security
+  - keystone_focal_ussuri_security: jammy-yoga-security
+  - keystone_focal_ussuri_security: lunar-antelope-security
+  - keystone_focal_ussuri_security: mantic-bobcat-security
 configure:
-  - keystone_v2_smoke: &configure_queens_and_older
+  - keystone_bionic_queens: &keystone_bionic_queens
     - zaza.openstack.charm_tests.ceilometer.setup.basic_setup
     - zaza.openstack.charm_tests.glance.setup.add_lts_image
     - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
@@ -32,9 +29,8 @@ configure:
     - zaza.openstack.charm_tests.keystone.setup.add_tempest_roles
     - zaza.openstack.charm_tests.glance.setup.add_cirros_image
     - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image
-  - keystone_v3_smoke: *configure_queens_and_older
-  - keystone_v3_smoke_security: *configure_queens_and_older
-  - keystone_v3_smoke_rocky: &configure_rocky_to_ussuri_without_vault
+  - keystone_bionic_queens_security: *keystone_bionic_queens
+  - keystone_bionic_ussuri:
     - zaza.openstack.charm_tests.ceilometer.setup.basic_setup
     - zaza.openstack.charm_tests.glance_simplestreams_sync.setup.sync_images
     - zaza.openstack.charm_tests.glance.setup.add_lts_image
@@ -49,8 +45,7 @@ configure:
     - zaza.openstack.charm_tests.glance.setup.add_cirros_image
     - zaza.openstack.charm_tests.glance.setup.add_cirros_alt_image
     - zaza.openstack.charm_tests.octavia.setup.centralized_fip_network
-  - keystone_v3_smoke_stein: *configure_rocky_to_ussuri_without_vault
-  - keystone_v3_smoke_focal: &configure_focal_and_later
+  - keystone_focal_ussuri: &keystone_focal_ussuri
     - zaza.openstack.charm_tests.vault.setup.auto_initialize
     - zaza.openstack.charm_tests.ceilometer.setup.basic_setup
     - zaza.openstack.charm_tests.glance_simplestreams_sync.setup.sync_images
@@ -68,44 +63,90 @@ configure:
     - zaza.openstack.charm_tests.octavia.setup.centralized_fip_network
     - zaza.openstack.charm_tests.magnum.setup.domain_setup
     - zaza.openstack.charm_tests.magnum.setup.add_image
-  - keystone_v3_smoke_focal_security: *configure_focal_and_later
+  - keystone_focal_ussuri_security: *keystone_focal_ussuri
+  - keystone_focal_wallaby: *keystone_focal_ussuri
 tests:
-  - keystone_v2_smoke:
-    - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV2
-  - keystone_v3_smoke:
+  - keystone_bionic_queens:
     - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
-  - keystone_v3_smoke_security:
+  - keystone_bionic_queens_security:
     - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
-  - keystone_v3_smoke_rocky:
+  - keystone_bionic_ussuri:
     - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
-  - keystone_v3_smoke_stein:
+  - keystone_focal_ussuri:
     - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
-  - keystone_v3_smoke_focal:
+  - keystone_focal_ussuri_security:
     - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
-  - keystone_v3_smoke_focal_security:
+  - keystone_focal_wallaby:
     - zaza.openstack.charm_tests.tempest.tests.TempestTestWithKeystoneV3
 tests_options:
-  keystone_v3_smoke_security:
+  keystone_bionic_queens_security:
     overlay_ppas:
       - ppa:ubuntu-security-proposed/ppa
-  keystone_v3_smoke_focal_security:
+  keystone_focal_ussuri_security:
     overlay_ppas:
       - ppa:ubuntu-security-proposed/ppa
   tempest:
-    keystone_v2_smoke:
+    keystone_bionic_queens:
       smoke: True
-    keystone_v3_smoke:
+      serial: True
+      exclude-list:
+        # designate tests fail with self.creds_client.assign_user_role_on_system 'No "reader" role found'
+        - "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest"
+        - "designate_tempest_plugin.tests.api.v2.test_zones_exports.ZonesExportTest"
+        - "designate_tempest_plugin.tests.api.v2.test_zones_imports.ZonesImportTest"
+        # octavia test fails with self.creds_client.assign_user_role 'No "load-balancer_admin" role found'
+        - "octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops.TrafficOperationsScenarioTest"
+    keystone_bionic_queens_security:
       smoke: True
-    keystone_v3_smoke_security:
+      serial: True
+      exclude-list:
+        # designate tests fail with self.creds_client.assign_user_role_on_system 'No "reader" role found'
+        - "designate_tempest_plugin.tests.api.v2.test_recordset.RecordsetsTest"
+        - "designate_tempest_plugin.tests.api.v2.test_zones_exports.ZonesExportTest"
+        - "designate_tempest_plugin.tests.api.v2.test_zones_imports.ZonesImportTest"
+        # octavia test fails with self.creds_client.assign_user_role 'No "load-balancer_admin" role found'
+        - "octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops.TrafficOperationsScenarioTest"
+    keystone_bionic_ussuri:
       smoke: True
-    keystone_v3_smoke_rocky:
+      serial: True
+    keystone_focal_ussuri:
       smoke: True
+      serial: True
+      include-list:
+        - "manila_tempest_tests.tests.api.admin.test_admin_actions.AdminActionsTest.*"
+        - "manila_tempest_tests.tests.api.admin.test_share_instances.ShareInstancesTest.*"
+        - "manila_tempest_tests.tests.api.admin.test_share_snapshot_instances.ShareSnapshotInstancesTest.*"
+        - "manila_tempest_tests.tests.api.admin.test_share_types.ShareTypesAdminTest.*"
+        - "manila_tempest_tests.tests.api.admin.test_shares_actions.SharesActionsAdminTest.*"
+        - "magnum_tempest_plugin.tests.api.v1.test_cluster"
+        - "magnum_tempest_plugin.tests.api.v1.test_cluster_template"
+        - "magnum_tempest_plugin.tests.api.v1.test_cluster_template_admin"
+        - "magnum_tempest_plugin.tests.api.v1.test_magnum_service"
+        # Note(coreycb): Disable watcher tests until all the failures can be debugged.
+        # - "watcher_tempest_plugin.tests.api"
+        # - "watcher_tempest_plugin.tests.scenario.test_execute_host_maintenance"
+        # - "watcher_tempest_plugin.tests.scenario.test_execute_vm_workload_consolidation"
       exclude-list:
-        - "tempest.api.identity.v3.test_domains.DefaultDomainTestJSON.test_default_domain_exists"
-    keystone_v3_smoke_stein:
-      smoke: True
-    keystone_v3_smoke_focal:
+        # designate failures due to check_list_show_RBAC_enforcement returning "Unauthorized"
+        - "designate_tempest_plugin.tests.api.v2.test_zones_exports.ZonesExportTest.test_show_zone_export"
+        - "designate_tempest_plugin.tests.api.v2.test_zones_imports.ZonesImportTest.test_show_zone_import"
+        # Exclude the known failures due to issues with octavia/manila policy
+        - "manila_tempest_tests.tests.api.admin.test_share_networks.ShareNetworkAdminTest"
+        - "manila_tempest_tests.tests.api.test_share_networks.ShareNetworksTest"
+        # Implemented on container-infra 1.10 which is available in >=Xena
+        # https://opendev.org/openstack/magnum/commit/0e6d17893
+        # https://opendev.org/openstack/magnum-tempest-plugin/commit/b68a678f37de0a769e7ee8dbefa9bdfe6cf445cc
+        - "magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_list_sign_delete_clusters"
+        - "magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_zero_nodes"
+        # The test expects a 400 error while the server returns a 401 error due to glance
+        # See logs at https://pastebin.ubuntu.com/p/V3DMcVmtyF/
+        - "magnum_tempest_plugin.tests.api.v1.test_cluster.ClusterTest.test_create_cluster_with_nonexisting_flavor"
+        - "octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops.TrafficOperationsScenarioTest"
+        # Note(coreycb): Disable watcher tests until all the failures can be debugged.
+        - "watcher_tempest_plugin.*"
+    keystone_focal_ussuri_security:
       smoke: True
+      serial: True
       include-list:
         - "manila_tempest_tests.tests.api.admin.test_admin_actions.AdminActionsTest.*"
         - "manila_tempest_tests.tests.api.admin.test_share_instances.ShareInstancesTest.*"
@@ -121,6 +162,9 @@ tests_options:
         # - "watcher_tempest_plugin.tests.scenario.test_execute_host_maintenance"
         # - "watcher_tempest_plugin.tests.scenario.test_execute_vm_workload_consolidation"
       exclude-list:
+        # designate failures due to check_list_show_RBAC_enforcement returning "Unauthorized"
+        - "designate_tempest_plugin.tests.api.v2.test_zones_exports.ZonesExportTest.test_show_zone_export"
+        - "designate_tempest_plugin.tests.api.v2.test_zones_imports.ZonesImportTest.test_show_zone_import"
         # Exclude the known failures due to issues with octavia/manila policy
         - "manila_tempest_tests.tests.api.admin.test_share_networks.ShareNetworkAdminTest"
         - "manila_tempest_tests.tests.api.test_share_networks.ShareNetworksTest"
@@ -135,8 +179,9 @@ tests_options:
         - "octavia_tempest_plugin.tests.scenario.v2.test_traffic_ops.TrafficOperationsScenarioTest"
         # Note(coreycb): Disable watcher tests until all the failures can be debugged.
         - "watcher_tempest_plugin.*"
-    keystone_v3_smoke_focal_security:
+    keystone_focal_wallaby:
       smoke: True
+      serial: True
       include-list:
         - "manila_tempest_tests.tests.api.admin.test_admin_actions.AdminActionsTest.*"
         - "manila_tempest_tests.tests.api.admin.test_share_instances.ShareInstancesTest.*"
@@ -168,9 +213,6 @@ tests_options:
         - "watcher_tempest_plugin.*"
   force_deploy:
     - bionic-queens
-    - bionic-rocky
-    - bionic-stein
-    - bionic-train
     - bionic-ussuri
     - lunar-antelope
     - mantic-bobcat