diff --git a/src/tests/bundles/focal-full.yaml b/src/tests/bundles/focal-full.yaml
index 3e9cf35..83e015c 100644
--- a/src/tests/bundles/focal-full.yaml
+++ b/src/tests/bundles/focal-full.yaml
@@ -34,26 +34,26 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: 3.8/edge
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.7/edge
   ovn-central:
     charm: ch:ovn-central
     num_units: 3
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: 22.03/edge
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: yoga/edge
   neutron-api:
     charm: ch:neutron-api
     series: *series
@@ -62,20 +62,20 @@ applications:
       flat-network-providers: physnet1
       neutron-security-groups: true
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   ovn-chassis:
     charm: ch:ovn-chassis
     channel: latest/edge
@@ -88,17 +88,16 @@ applications:
       enable-resize: true
       migration-auth-type: ssh
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   memcached:
-    charm: cs:memcached
+    charm: ch:memcached
     num_units: 1
-    series: bionic
 relations:
   - - neutron-api:amqp
     - rabbitmq-server:amqp
diff --git a/src/tests/bundles/focal.yaml b/src/tests/bundles/focal.yaml
index bef1b9a..7f6ee45 100644
--- a/src/tests/bundles/focal.yaml
+++ b/src/tests/bundles/focal.yaml
@@ -15,11 +15,11 @@ applications:
   keystone:
     charm: ch:keystone
     num_units: 1
-    channel: latest/edge
+    channel: yoga/edge
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.7/edge
 relations:
   - - vault:certificates
     - mysql-innodb-cluster:certificates
diff --git a/src/tests/bundles/jammy-full-ha.yaml b/src/tests/bundles/jammy-full-ha.yaml
deleted file mode 100644
index 3eb327e..0000000
--- a/src/tests/bundles/jammy-full-ha.yaml
+++ /dev/null
@@ -1,180 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-series: &series jammy
-
-applications:
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ../../../mysql-innodb-cluster.charm
-    num_units: 3
-    options:
-      source: *openstack-origin
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  neutron-api-plugin-ovn:
-    charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    series: *series
-    num_units: 1
-    options:
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  ovn-chassis:
-    charm: ch:ovn-chassis
-    channel: latest/edge
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  memcached:
-    charm: cs:memcached
-    num_units: 1
-    series: focal
-relations:
-  - - neutron-api:amqp
-    - rabbitmq-server:amqp
-  - - neutron-api:neutron-api
-    - nova-cloud-controller:neutron-api
-  - - neutron-api:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - placement:identity-service
-    - keystone:identity-service
-  - - placement:placement
-    - nova-cloud-controller:placement
-  - - neutron-api-plugin-ovn:neutron-plugin
-    - neutron-api:neutron-plugin-api-subordinate
-  - - ovn-central:certificates
-    - vault:certificates
-  - - ovn-central:ovsdb-cms
-    - neutron-api-plugin-ovn:ovsdb-cms
-  - - neutron-api:certificates
-    - vault:certificates
-  - - ovn-chassis:nova-compute
-    - nova-compute:neutron-plugin
-  - - ovn-chassis:certificates
-    - vault:certificates
-  - - ovn-chassis:ovsdb
-    - ovn-central:ovsdb
-  - - vault:certificates
-    - neutron-api-plugin-ovn:certificates
-  - - vault:certificates
-    - glance:certificates
-  - - vault:certificates
-    - keystone:certificates
-  - - vault:certificates
-    - nova-cloud-controller:certificates
-  - - vault:certificates
-    - placement:certificates
-  - - vault:certificates
-    - mysql-innodb-cluster:certificates
-  - - memcached:cache
-    - nova-cloud-controller:memcache
-  - - keystone:shared-db
-    - keystone-mysql-router:shared-db
-  - - glance:shared-db
-    - glance-mysql-router:shared-db
-  - - nova-cloud-controller:shared-db
-    - nova-mysql-router:shared-db
-  - - neutron-api:shared-db
-    - neutron-mysql-router:shared-db
-  - - placement:shared-db
-    - placement-mysql-router:shared-db
-  - - vault:shared-db
-    - vault-mysql-router:shared-db
-  - - keystone-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - nova-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - glance-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - neutron-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - placement-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
-  - - vault-mysql-router:db-router
-    - mysql-innodb-cluster:db-router
diff --git a/src/tests/bundles/jammy-full-ha.yaml b/src/tests/bundles/jammy-full-ha.yaml
new file mode 120000
index 0000000..d4e0c33
--- /dev/null
+++ b/src/tests/bundles/jammy-full-ha.yaml
@@ -0,0 +1 @@
+jammy-full.yaml
\ No newline at end of file
diff --git a/src/tests/bundles/jammy-full.yaml b/src/tests/bundles/jammy-full.yaml
index 3eb327e..dd91159 100644
--- a/src/tests/bundles/jammy-full.yaml
+++ b/src/tests/bundles/jammy-full.yaml
@@ -34,26 +34,26 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: 3.9/edge
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.7/edge
   ovn-central:
     charm: ch:ovn-central
     num_units: 3
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: 22.03/edge
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: yoga/edge
   neutron-api:
     charm: ch:neutron-api
     series: *series
@@ -62,23 +62,23 @@ applications:
       flat-network-providers: physnet1
       neutron-security-groups: true
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   nova-cloud-controller:
     charm: ch:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   ovn-chassis:
     charm: ch:ovn-chassis
-    channel: latest/edge
+    channel: 22.03/edge
   nova-compute:
     charm: ch:nova-compute
     num_units: 1
@@ -88,17 +88,16 @@ applications:
       enable-resize: true
       migration-auth-type: ssh
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: yoga/edge
   memcached:
     charm: cs:memcached
     num_units: 1
-    series: focal
 relations:
   - - neutron-api:amqp
     - rabbitmq-server:amqp
diff --git a/src/tests/bundles/jammy.yaml b/src/tests/bundles/jammy.yaml
index addeead..5e05f2d 100644
--- a/src/tests/bundles/jammy.yaml
+++ b/src/tests/bundles/jammy.yaml
@@ -14,11 +14,11 @@ applications:
   keystone:
     charm: ch:keystone
     num_units: 1
-    channel: latest/edge
+    channel: yoga/edge
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.7/edge
 relations:
   - - vault:certificates
     - mysql-innodb-cluster:certificates
diff --git a/src/tests/bundles/overlays/focal-full-ha.yaml.j2 b/src/tests/bundles/overlays/focal-full-ha.yaml.j2
index 85bd5a1..69519f9 100644
--- a/src/tests/bundles/overlays/focal-full-ha.yaml.j2
+++ b/src/tests/bundles/overlays/focal-full-ha.yaml.j2
@@ -9,10 +9,10 @@ applications:
       vip: {{TEST_VIP01}}
   keystone-hacluster:
     charm: ch:hacluster
-    channel: latest/edge
+    channel: 2.0.3/edge
   nova-hacluster:
     charm: ch:hacluster
-    channel: latest/edge
+    channel: 2.0.3/edge
 relations:
 - ["keystone:ha", "keystone-hacluster:ha"]
 - ["nova-cloud-controller:ha", "nova-hacluster:ha"]
diff --git a/src/tests/bundles/overlays/jammy-full-ha.yaml.j2 b/src/tests/bundles/overlays/jammy-full-ha.yaml.j2
index 85bd5a1..bca709d 100644
--- a/src/tests/bundles/overlays/jammy-full-ha.yaml.j2
+++ b/src/tests/bundles/overlays/jammy-full-ha.yaml.j2
@@ -9,10 +9,10 @@ applications:
       vip: {{TEST_VIP01}}
   keystone-hacluster:
     charm: ch:hacluster
-    channel: latest/edge
+    channel: 2.4/edge
   nova-hacluster:
     charm: ch:hacluster
-    channel: latest/edge
+    channel: 2.4/edge
 relations:
 - ["keystone:ha", "keystone-hacluster:ha"]
 - ["nova-cloud-controller:ha", "nova-hacluster:ha"]