diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml
index 72cf813..edf3bfb 100644
--- a/src/tests/bundles/focal-xena.yaml
+++ b/src/tests/bundles/focal-xena.yaml
@@ -5,44 +5,13 @@ local_overlay_enabled: False
 
 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':
-
 applications:
 
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
   vault:
     charm: ch:vault
     num_units: 1
-    to:
-      - '3'
+    # The vault raft support is currently only available for jammy
+    series: jammy
     channel: latest/edge
 
   ovn-central:
@@ -50,10 +19,6 @@ applications:
     num_units: 3
     options:
       source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
     channel: latest/edge
 
   ovn-dedicated-chassis:
@@ -61,16 +26,9 @@ applications:
     num_units: 2
     options:
       source: *openstack-origin
-    to:
-      - '7'
-      - '8'
 
 relations:
 
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
   - - 'ovn-central:certificates'
     - 'vault:certificates'
   - - 'ovn-dedicated-chassis:ovsdb'
diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml
index 8f004ae..76193fb 100644
--- a/src/tests/bundles/focal-yoga.yaml
+++ b/src/tests/bundles/focal-yoga.yaml
@@ -5,44 +5,13 @@ local_overlay_enabled: False
 
 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':
-
 applications:
 
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
   vault:
     charm: ch:vault
     num_units: 1
-    to:
-      - '3'
+    # The vault raft support is currently only available for jammy
+    series: jammy
     channel: latest/edge
 
   ovn-central:
@@ -50,10 +19,6 @@ applications:
     num_units: 3
     options:
       source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
     channel: latest/edge
 
   ovn-dedicated-chassis:
@@ -61,16 +26,9 @@ applications:
     num_units: 2
     options:
       source: *openstack-origin
-    to:
-      - '7'
-      - '8'
 
 relations:
 
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
   - - 'ovn-central:certificates'
     - 'vault:certificates'
   - - 'ovn-dedicated-chassis:ovsdb'
diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml
index 42e6d4e..a64acca 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/jammy-yoga.yaml
@@ -5,44 +5,11 @@ local_overlay_enabled: False
 
 series: jammy
 
-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':
-
 applications:
 
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
   vault:
     charm: ch:vault
     num_units: 1
-    to:
-      - '3'
     channel: latest/edge
   
   ovn-central:
@@ -50,10 +17,6 @@ applications:
     num_units: 3
     options:
       source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
     channel: latest/edge
 
   ovn-dedicated-chassis:
@@ -61,17 +24,10 @@ applications:
     num_units: 2
     options:
       source: *openstack-origin
-    to:
-      - '7'
-      - '8'
 
 
 relations:
 
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
   - - 'ovn-central:certificates'
     - 'vault:certificates'
   - - 'ovn-dedicated-chassis:ovsdb'