diff --git a/osci.yaml b/osci.yaml
index bcde713..886ae16 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -7,7 +7,11 @@
       - focal-ussuri-ha_keystone-saml-mellon
       - focal-victoria-ha_keystone-saml-mellon
       - focal-wallaby-ha_keystone-saml-mellon
+      - focal-xena-ha_keystone-saml-mellon:
+          voting: false
       - hirsute-wallaby-ha_keystone-saml-mellon
+      - impish-xena-ha_keystone-saml-mellon:
+          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: keystone-saml-mellon
@@ -42,9 +46,21 @@
     dependencies:  *smoke-jobs
     vars:
       tox_extra_args: focal-wallaby-ha
+- job:
+    name: focal-xena-ha_keystone-saml-mellon
+    parent: func-target
+    dependencies:  *smoke-jobs
+    vars:
+      tox_extra_args: focal-xena-ha
 - job:
     name: hirsute-wallaby-ha_keystone-saml-mellon
     parent: func-target
     dependencies:  *smoke-jobs
     vars:
       tox_extra_args: hirsute-wallaby-ha
+- job:
+    name: impish-xena-ha_keystone-saml-mellon
+    parent: func-target
+    dependencies:  *smoke-jobs
+    vars:
+      tox_extra_args: impish-xena-ha
diff --git a/pip.sh b/pip.sh
index 8752bb4..9a7e6b0 100755
--- a/pip.sh
+++ b/pip.sh
@@ -16,4 +16,3 @@
 # depedencies declared in the target.
 pip install 'pip<20.3' 'setuptools<50.0.0'
 pip "$@"
-
diff --git a/rebuild b/rebuild
index 7a4f387..4456f20 100644
--- a/rebuild
+++ b/rebuild
@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-fa041078-b3eb-11eb-acb1-9b3ca8d6ef14
+53ca3472-1178-11ec-a207-ff8eb90f32ec
diff --git a/src/tests/bundles/focal-ussuri-ha.yaml b/src/tests/bundles/focal-ussuri-ha.yaml
index 1fbb13f..497e175 100644
--- a/src/tests/bundles/focal-ussuri-ha.yaml
+++ b/src/tests/bundles/focal-ussuri-ha.yaml
@@ -179,6 +179,7 @@ applications:
       user-facing-name: "Test SAML IDP #1"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp1:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
@@ -198,6 +199,7 @@ applications:
       user-facing-name: "Test SAML IDP #2"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp2:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
@@ -213,6 +215,7 @@ applications:
     options:
       corosync_transport: unicast
       cluster_count: 3
+
   openstack-dashboard-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
     num_units: 0
diff --git a/src/tests/bundles/focal-victoria-ha.yaml b/src/tests/bundles/focal-victoria-ha.yaml
index c4812ca..2a285be 100644
--- a/src/tests/bundles/focal-victoria-ha.yaml
+++ b/src/tests/bundles/focal-victoria-ha.yaml
@@ -179,6 +179,7 @@ applications:
       user-facing-name: "Test SAML IDP #1"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp1:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
@@ -198,6 +199,7 @@ applications:
       user-facing-name: "Test SAML IDP #2"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp2:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
@@ -213,6 +215,7 @@ applications:
     options:
       corosync_transport: unicast
       cluster_count: 3
+
   openstack-dashboard-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
     num_units: 0
diff --git a/src/tests/bundles/focal-wallaby-ha.yaml b/src/tests/bundles/focal-wallaby-ha.yaml
index 6015eee..d4ed938 100644
--- a/src/tests/bundles/focal-wallaby-ha.yaml
+++ b/src/tests/bundles/focal-wallaby-ha.yaml
@@ -179,6 +179,7 @@ applications:
       user-facing-name: "Test SAML IDP #1"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp1:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
@@ -198,6 +199,7 @@ applications:
       user-facing-name: "Test SAML IDP #2"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp2:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
@@ -213,6 +215,7 @@ applications:
     options:
       corosync_transport: unicast
       cluster_count: 3
+
   openstack-dashboard-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
     num_units: 0
diff --git a/src/tests/bundles/focal-xena-ha.yaml b/src/tests/bundles/focal-xena-ha.yaml
new file mode 100644
index 0000000..26c6e04
--- /dev/null
+++ b/src/tests/bundles/focal-xena-ha.yaml
@@ -0,0 +1,383 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-xena
+
+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':
+  '16':
+  '17':
+  '18':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  openstack-dashboard-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  vault-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'
+
+  cinder:
+    num_units: 1
+    charm: cs:~openstack-charmers-next/cinder
+    options:
+      openstack-origin: *openstack-origin
+      glance-api-version: 2
+      block-device: None
+    to:
+      - '3'
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+      token-provider: 'fernet'
+    to:
+      - '5'
+      - '6'
+      - '7'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      manage-neutron-plugin-legacy-mode: true
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+    to:
+      - '8'
+
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      bridge-mappings: physnet1:br-ex
+    to:
+      - '9'
+
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      network-manager: Neutron
+    to:
+      - '10'
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      openstack-origin: *openstack-origin
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+    to:
+      - '11'
+      - '12'
+
+  ntp:
+    charm: cs:ntp
+    num_units: 0
+
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '13'
+      - '14'
+      - '15'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '16'
+
+  vault:
+    num_units: 1
+    charm: cs:~openstack-charmers-next/vault
+    to:
+      - '17'
+
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '18'
+
+  keystone-saml-mellon1:
+    series: focal
+    charm: ../../../keystone-saml-mellon
+    num_units: 0
+    options:
+      idp-name: 'test-saml-idp1'
+      protocol-name: 'mapped'
+      user-facing-name: "Test SAML IDP #1"
+      subject-confirmation-data-address-check: False
+      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
+  test-saml-idp1:
+    charm: cs:~ionutbalutoiu/test-saml-idp
+    num_units: 1
+    options:
+      idp-name: 'test-saml-idp1'
+      protocol-name: 'mapped'
+      auth-user-name: 'user1'
+      auth-user-password: 'userpass1'
+
+  keystone-saml-mellon2:
+    series: focal
+    charm: ../../../keystone-saml-mellon
+    num_units: 0
+    options:
+      idp-name: 'test-saml-idp2'
+      protocol-name: 'mapped'
+      user-facing-name: "Test SAML IDP #2"
+      subject-confirmation-data-address-check: False
+      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
+  test-saml-idp2:
+    charm: cs:~ionutbalutoiu/test-saml-idp
+    num_units: 1
+    options:
+      idp-name: 'test-saml-idp2'
+      protocol-name: 'mapped'
+      auth-user-name: 'user2'
+      auth-user-password: 'userpass2'
+
+  keystone-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+
+  openstack-dashboard-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+
+relations:
+
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-openvswitch:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-gateway:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - '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:neutron-api'
+    - 'neutron-api:neutron-api'
+
+  - - 'cinder:image-service'
+    - 'glance:image-service'
+
+  - - 'cinder:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'cinder:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'cinder:cinder-volume-service'
+    - 'nova-cloud-controller:cinder-volume-service'
+
+  - - 'cinder:shared-db'
+    - 'cinder-mysql-router:shared-db'
+  - - 'cinder-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'ntp:juju-info'
+    - 'nova-compute:juju-info'
+
+  - - 'ntp:juju-info'
+    - 'neutron-gateway:juju-info'
+
+  - - 'keystone'
+    - 'keystone-saml-mellon1'
+  - - 'keystone'
+    - 'keystone-saml-mellon2'
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'vault:certificates'
+    - 'keystone:certificates'
+
+  - - 'vault:certificates'
+    - 'glance:certificates'
+
+  - - 'vault:certificates'
+    - 'openstack-dashboard:certificates'
+
+  - - 'openstack-dashboard'
+    - 'keystone-saml-mellon1'
+  - - 'openstack-dashboard'
+    - 'keystone-saml-mellon2'
+
+  - - 'keystone:websso-trusted-dashboard'
+    - 'openstack-dashboard:websso-trusted-dashboard'
+
+  - - 'vault:certificates'
+    - 'cinder:certificates'
+
+  - - 'vault:certificates'
+    - 'neutron-api:certificates'
+
+  - - 'vault:certificates'
+    - 'nova-cloud-controller:certificates'
+
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+
+  - - 'vault:certificates'
+    - 'placement:certificates'
+
+  - - "placement:shared-db"
+    - "placement-mysql-router:shared-db"
+  - - "placement-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
+
+  - - "keystone:ha"
+    - "keystone-hacluster:ha"
+  - - "openstack-dashboard:ha"
+    - "openstack-dashboard-hacluster:ha"
diff --git a/src/tests/bundles/groovy-victoria-ha.yaml b/src/tests/bundles/groovy-victoria-ha.yaml
index 9acc235..32fc9db 100644
--- a/src/tests/bundles/groovy-victoria-ha.yaml
+++ b/src/tests/bundles/groovy-victoria-ha.yaml
@@ -175,9 +175,11 @@ applications:
       user-facing-name: "Test SAML IDP #1"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp1:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
+    series: focal
     options:
       idp-name: 'test-saml-idp1'
       protocol-name: 'mapped'
@@ -194,9 +196,11 @@ applications:
       user-facing-name: "Test SAML IDP #2"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp2:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
+    series: focal
     options:
       idp-name: 'test-saml-idp2'
       protocol-name: 'mapped'
@@ -209,6 +213,7 @@ applications:
     options:
       corosync_transport: unicast
       cluster_count: 3
+
   openstack-dashboard-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
     num_units: 0
diff --git a/src/tests/bundles/hirsute-wallaby-ha.yaml b/src/tests/bundles/hirsute-wallaby-ha.yaml
index 7646686..04577a4 100644
--- a/src/tests/bundles/hirsute-wallaby-ha.yaml
+++ b/src/tests/bundles/hirsute-wallaby-ha.yaml
@@ -175,9 +175,11 @@ applications:
       user-facing-name: "Test SAML IDP #1"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp1:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
+    series: focal
     options:
       idp-name: 'test-saml-idp1'
       protocol-name: 'mapped'
@@ -194,9 +196,11 @@ applications:
       user-facing-name: "Test SAML IDP #2"
       subject-confirmation-data-address-check: False
       nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
   test-saml-idp2:
     charm: cs:~ionutbalutoiu/test-saml-idp
     num_units: 1
+    series: focal
     options:
       idp-name: 'test-saml-idp2'
       protocol-name: 'mapped'
@@ -209,6 +213,7 @@ applications:
     options:
       corosync_transport: unicast
       cluster_count: 3
+
   openstack-dashboard-hacluster:
     charm: cs:~openstack-charmers-next/hacluster
     num_units: 0
diff --git a/src/tests/bundles/impish-xena-ha.yaml b/src/tests/bundles/impish-xena-ha.yaml
new file mode 100644
index 0000000..6db359c
--- /dev/null
+++ b/src/tests/bundles/impish-xena-ha.yaml
@@ -0,0 +1,386 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: impish
+
+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':
+  '16':
+  '17':
+  '18':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  openstack-dashboard-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  vault-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'
+
+  cinder:
+    num_units: 1
+    charm: cs:~openstack-charmers-next/cinder
+    options:
+      openstack-origin: *openstack-origin
+      glance-api-version: 2
+      block-device: None
+    to:
+      - '3'
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+      token-provider: 'fernet'
+    to:
+      - '5'
+      - '6'
+      - '7'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      manage-neutron-plugin-legacy-mode: true
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+    to:
+      - '8'
+
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      bridge-mappings: physnet1:br-ex
+    to:
+      - '9'
+
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    num_units: 0
+
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      network-manager: Neutron
+    to:
+      - '10'
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    options:
+      openstack-origin: *openstack-origin
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+    to:
+      - '11'
+      - '12'
+
+  ntp:
+    charm: cs:ntp
+    series: focal
+    num_units: 0
+
+  openstack-dashboard:
+    charm: cs:~openstack-charmers-next/openstack-dashboard
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '13'
+      - '14'
+      - '15'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '16'
+
+  vault:
+    num_units: 1
+    charm: cs:~openstack-charmers-next/vault
+    to:
+      - '17'
+
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '18'
+
+  keystone-saml-mellon1:
+    series: groovy
+    charm: ../../../keystone-saml-mellon
+    num_units: 0
+    options:
+      idp-name: 'test-saml-idp1'
+      protocol-name: 'mapped'
+      user-facing-name: "Test SAML IDP #1"
+      subject-confirmation-data-address-check: False
+      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
+  test-saml-idp1:
+    charm: cs:~ionutbalutoiu/test-saml-idp
+    num_units: 1
+    series: focal
+    options:
+      idp-name: 'test-saml-idp1'
+      protocol-name: 'mapped'
+      auth-user-name: 'user1'
+      auth-user-password: 'userpass1'
+
+  keystone-saml-mellon2:
+    series: groovy
+    charm: ../../../keystone-saml-mellon
+    num_units: 0
+    options:
+      idp-name: 'test-saml-idp2'
+      protocol-name: 'mapped'
+      user-facing-name: "Test SAML IDP #2"
+      subject-confirmation-data-address-check: False
+      nameid-formats: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+
+  test-saml-idp2:
+    charm: cs:~ionutbalutoiu/test-saml-idp
+    num_units: 1
+    series: focal
+    options:
+      idp-name: 'test-saml-idp2'
+      protocol-name: 'mapped'
+      auth-user-name: 'user2'
+      auth-user-password: 'userpass2'
+
+  keystone-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+
+  openstack-dashboard-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    num_units: 0
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+
+relations:
+
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-openvswitch:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-gateway:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'openstack-dashboard:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'openstack-dashboard:shared-db'
+    - 'openstack-dashboard-mysql-router:shared-db'
+  - - 'openstack-dashboard-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - '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:neutron-api'
+    - 'neutron-api:neutron-api'
+
+  - - 'cinder:image-service'
+    - 'glance:image-service'
+
+  - - 'cinder:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'cinder:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'cinder:cinder-volume-service'
+    - 'nova-cloud-controller:cinder-volume-service'
+
+  - - 'cinder:shared-db'
+    - 'cinder-mysql-router:shared-db'
+  - - 'cinder-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'ntp:juju-info'
+    - 'nova-compute:juju-info'
+
+  - - 'ntp:juju-info'
+    - 'neutron-gateway:juju-info'
+
+  - - 'keystone'
+    - 'keystone-saml-mellon1'
+  - - 'keystone'
+    - 'keystone-saml-mellon2'
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'vault:certificates'
+    - 'keystone:certificates'
+
+  - - 'vault:certificates'
+    - 'glance:certificates'
+
+  - - 'vault:certificates'
+    - 'openstack-dashboard:certificates'
+
+  - - 'openstack-dashboard'
+    - 'keystone-saml-mellon1'
+  - - 'openstack-dashboard'
+    - 'keystone-saml-mellon2'
+
+  - - 'keystone:websso-trusted-dashboard'
+    - 'openstack-dashboard:websso-trusted-dashboard'
+
+  - - 'vault:certificates'
+    - 'cinder:certificates'
+
+  - - 'vault:certificates'
+    - 'neutron-api:certificates'
+
+  - - 'vault:certificates'
+    - 'nova-cloud-controller:certificates'
+
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+
+  - - 'vault:certificates'
+    - 'placement:certificates'
+
+  - - "placement:shared-db"
+    - "placement-mysql-router:shared-db"
+  - - "placement-mysql-router:db-router"
+    - "mysql-innodb-cluster:db-router"
+
+  - - "keystone:ha"
+    - "keystone-hacluster:ha"
+  - - "openstack-dashboard:ha"
+    - "openstack-dashboard-hacluster:ha"
diff --git a/src/tests/bundles/overlays/focal-xena-ha.yaml.j2 b/src/tests/bundles/overlays/focal-xena-ha.yaml.j2
new file mode 120000
index 0000000..9280f58
--- /dev/null
+++ b/src/tests/bundles/overlays/focal-xena-ha.yaml.j2
@@ -0,0 +1 @@
+ha.yaml.j2
\ No newline at end of file
diff --git a/src/tests/bundles/overlays/impish-xena-ha.yaml.j2 b/src/tests/bundles/overlays/impish-xena-ha.yaml.j2
new file mode 120000
index 0000000..9280f58
--- /dev/null
+++ b/src/tests/bundles/overlays/impish-xena-ha.yaml.j2
@@ -0,0 +1 @@
+ha.yaml.j2
\ No newline at end of file
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index b9056a5..941e016 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -8,10 +8,12 @@ gate_bundles:
 - focal-ussuri-ha
 - focal-victoria-ha
 - focal-wallaby-ha
-- groovy-victoria-ha
+- focal-xena-ha
 
 dev_bundles:
+- groovy-victoria-ha
 - hirsute-wallaby-ha
+- impish-xena-ha
 
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize
@@ -57,5 +59,5 @@ target_deploy_status:
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby-ha
+    - impish-xena-ha
     - groovy-victoria-ha