diff --git a/.gitreview b/.gitreview
index 301f204..531f9a6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-watcher.git
+
+defaultbranch=stable/zed
diff --git a/charmcraft.yaml b/charmcraft.yaml
index bceb9b3..4698909 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -24,8 +24,5 @@ bases:
         channel: "22.04"
         architectures: [amd64, arm64, ppc64el, s390x]
       - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64, arm64, ppc64el, s390x]
-      - name: ubuntu
-        channel: "23.10"
+        channel: "22.10"
         architectures: [amd64, arm64, ppc64el, s390x]
diff --git a/osci.yaml b/osci.yaml
index fd7619e..01b6d9c 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,9 +1,9 @@
 - project:
     templates:
-      - charm-unit-jobs
-      - charm-functional-jobs
+      - charm-unit-jobs-py310
+      - charm-zed-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: watcher
       build_type: charmcraft
-      charmcraft_channel: 2.x/stable
+      charmcraft_channel: 2.0/stable
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 3e1513d..00404da 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -6,13 +6,12 @@ description: |
   OpenStack Watcher provides a flexible and scalable resource
   optimization service for multi-tenant clouds.
   .
-  OpenStack Train or later is required.
+  OpenStack Yoga or later is required.
 tags:
   - openstack
 series:
   - jammy
-  - lunar
-  - mantic
+  - kinetic
 subordinate: false
 requires:
   shared-db:
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index 1a31860..8c09775 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -7,5 +7,5 @@ mock>=1.2
 flake8>=2.2.4,<=2.4.1
 stestr>=2.2.0
 requests>=2.18.4
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/zed#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/zed#egg=zaza.openstack
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
deleted file mode 100644
index 9a37c23..0000000
--- a/src/tests/bundles/jammy-antelope.yaml
+++ /dev/null
@@ -1,287 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:jammy-antelope
-
-series: &series jammy
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  gnocchi-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-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
-  watcher-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    channel: latest/edge
-    num_units: 3
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    channel: latest/edge
-    num_units: 1
-
-  keystone:
-    charm: ch:keystone
-    channel: latest/edge
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-
-  watcher:
-    charm: ../../../watcher.charm
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: True
-      datasources: gnocchi
-      planner: weight
-      planner-config: >
-        {
-            "weights": "change_node_power_state:9,change_nova_service_state:50,migrate:30,nop:70,resize:20,sleep:40,turn_host_to_acpi_s3_state:10,volume_migrate:60",
-            "parallelization": "change_node_power_state:2,change_nova_service_state:1,migrate:2,nop:1,resize:2,sleep:1,turn_host_to_acpi_s3_state:2,volume_migrate:2"
-        }
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      network-manager: Neutron
-      debug: true
-    channel: latest/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: false
-      openstack-origin: *openstack-origin
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-    channel: latest/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 2
-    constraints: "mem=8G"
-    storage:
-      ephemeral-device: '40G'
-    options:
-      openstack-origin: *openstack-origin
-      enable-live-migration: true
-      debug: true
-      config-flags: "compute_monitors=cpu.virt_driver"
-      libvirt-image-backend: "rbd"
-    channel: latest/edge
-
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
-
-  ovn-central:
-    charm: ch:ovn-central
-    channel: latest/edge
-    num_units: 3
-    options:
-      source: *openstack-origin
-
-  ovn-chassis:
-    charm: ch:ovn-chassis
-    channel: latest/edge
-
-  neutron-api-plugin-ovn:
-    charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
-
-  ceilometer:
-    charm: ch:ceilometer
-    channel: latest/edge
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-
-  gnocchi:
-    charm: ch:gnocchi
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-
-  ceilometer-agent:
-    charm: ch:ceilometer-agent
-    channel: latest/edge
-
-  memcached:
-    charm: ch:memcached
-    num_units: 1
-    series: jammy
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: '20G'
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      source: *openstack-origin
-      monitor-count: '3'
-    channel: latest/edge
-
-relations:
-- - 'keystone:shared-db'
-  - 'keystone-mysql-router:shared-db'
-- - 'keystone-mysql-router:db-router'
-  - 'mysql-innodb-cluster:db-router'
-- - 'watcher:shared-db'
-  - 'watcher-mysql-router:shared-db'
-- - 'watcher-mysql-router:db-router'
-  - 'mysql-innodb-cluster:db-router'
-- - 'keystone:identity-service'
-  - 'watcher:identity-service'
-- - 'rabbitmq-server:amqp'
-  - 'watcher:amqp'
-- - 'ovn-central:certificates'
-  - 'vault:certificates'
-- - 'ovn-chassis:certificates'
-  - 'vault:certificates'
-- - 'ovn-chassis'
-  - 'nova-compute'
-- - 'ovn-chassis'
-  - 'ovn-central'
-- - 'nova-compute:image-service'
-  - 'glance:image-service'
-- - 'nova-compute:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:shared-db'
-  - 'nova-cloud-controller-mysql-router:shared-db'
-- - 'nova-cloud-controller-mysql-router:db-router'
-  - 'mysql-innodb-cluster:db-router'
-- - 'nova-cloud-controller:identity-service'
-  - 'keystone:identity-service'
-- - 'nova-cloud-controller:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-cloud-controller:cloud-compute'
-  - 'nova-compute:cloud-compute'
-- - 'nova-cloud-controller:image-service'
-  - 'glance:image-service'
-- - 'glance:identity-service'
-  - 'keystone:identity-service'
-- - 'glance:shared-db'
-  - 'glance-mysql-router:shared-db'
-- - 'glance-mysql-router:db-router'
-  - 'mysql-innodb-cluster:db-router'
-- - 'glance:amqp'
-  - 'rabbitmq-server:amqp'
-- - '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-api:neutron-api'
-  - 'nova-cloud-controller:neutron-api'
-- - 'neutron-api:identity-service'
-  - 'keystone:identity-service'
-- - 'placement:shared-db'
-  - 'placement-mysql-router:shared-db'
-- - 'placement-mysql-router:db-router'
-  - 'mysql-innodb-cluster:db-router'
-- - 'placement:identity-service'
-  - 'keystone:identity-service'
-- - 'placement:placement'
-  - 'nova-cloud-controller:placement'
-- - 'vault:shared-db'
-  - 'vault-mysql-router:shared-db'
-- - 'vault-mysql-router:db-router'
-  - 'mysql-innodb-cluster:db-router'
-- - 'ceilometer:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'ceilometer:identity-notifications'
-  - 'keystone:identity-notifications'
-- - 'ceilometer:ceilometer-service'
-  - 'ceilometer-agent:ceilometer-service'
-- - 'ceilometer:metric-service'
-  - 'gnocchi:metric-service'
-- - 'ceilometer:identity-credentials'
-  - 'keystone:identity-credentials'
-- - 'ceilometer-agent:amqp'
-  - 'rabbitmq-server:amqp'
-- - 'nova-compute:nova-ceilometer'
-  - 'ceilometer-agent:nova-ceilometer'
-- - 'gnocchi:shared-db'
-  - 'gnocchi-mysql-router:shared-db'
-- - 'gnocchi-mysql-router:db-router'
-  - 'mysql-innodb-cluster:db-router'
-- - 'gnocchi:coordinator-memcached'
-  - 'memcached:cache'
-- - 'gnocchi:identity-service'
-  - 'keystone:identity-service'
-- - 'gnocchi:storage-ceph'
-  - 'ceph-mon:client'
-- - 'ceph-mon:osd'
-  - 'ceph-osd:mon'
-- - 'ceph-mon:client'
-  - 'nova-compute:ceph'
-- - 'ovn-central:ovsdb-cms'
-  - 'neutron-api-plugin-ovn:ovsdb-cms'
-- - 'neutron-api:neutron-plugin-api-subordinate'
-  - 'neutron-api-plugin-ovn:neutron-plugin'
-- - 'neutron-api-plugin-ovn:certificates'
-  - 'vault:certificates'
-- - 'watcher:certificates'
-  - 'vault:certificates'
-- - 'keystone:certificates'
-  - 'vault:certificates'
-- - 'ceilometer:certificates'
-  - 'vault:certificates'
-- - 'nova-cloud-controller:certificates'
-  - 'vault:certificates'
-- - 'gnocchi:certificates'
-  - 'vault:certificates'
-- - 'glance:certificates'
-  - 'vault:certificates'
-- - 'placement:certificates'
-  - 'vault:certificates'
-- - 'neutron-api:certificates'
-  - 'vault:certificates'
diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/jammy-yoga.yaml
similarity index 91%
rename from src/tests/bundles/lunar-antelope.yaml
rename to src/tests/bundles/jammy-yoga.yaml
index 44c6b12..bf98520 100644
--- a/src/tests/bundles/lunar-antelope.yaml
+++ b/src/tests/bundles/jammy-yoga.yaml
@@ -1,48 +1,48 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: &series lunar
+series: &series jammy
 
 applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   gnocchi-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   neutron-api-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   placement-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   watcher-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
-    channel: latest/edge
+    channel: 8.0/edge
     num_units: 3
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
-    channel: latest/edge
+    channel: 3.9/edge
     num_units: 1
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: zed/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: zed/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: zed/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,31 +106,31 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: zed/edge
 
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.8/edge
 
   ovn-central:
     charm: ch:ovn-central
-    channel: latest/edge
+    channel: 22.09/edge
     num_units: 3
     options:
       source: *openstack-origin
 
   ovn-chassis:
     charm: ch:ovn-chassis
-    channel: latest/edge
+    channel: 22.09/edge
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: zed/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: zed/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: zed/edge
 
   memcached:
     charm: ch:memcached
@@ -158,7 +158,7 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: quincy/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -166,7 +166,7 @@ applications:
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: quincy/edge
 
 relations:
 - - 'keystone:shared-db'
diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-zed.yaml
similarity index 90%
rename from src/tests/bundles/jammy-bobcat.yaml
rename to src/tests/bundles/jammy-zed.yaml
index aed4dff..413a558 100644
--- a/src/tests/bundles/jammy-bobcat.yaml
+++ b/src/tests/bundles/jammy-zed.yaml
@@ -1,5 +1,5 @@
 variables:
-  openstack-origin: &openstack-origin cloud:jammy-bobcat
+  openstack-origin: &openstack-origin cloud:jammy-zed
 
 series: &series jammy
 
@@ -7,42 +7,42 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   gnocchi-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   neutron-api-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   placement-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   watcher-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
-    channel: latest/edge
+    channel: 8.0/edge
     num_units: 3
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
-    channel: latest/edge
+    channel: 3.9/edge
     num_units: 1
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: zed/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: zed/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: zed/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,31 +106,31 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: zed/edge
 
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.8/edge
 
   ovn-central:
     charm: ch:ovn-central
-    channel: latest/edge
+    channel: 22.09/edge
     num_units: 3
     options:
       source: *openstack-origin
 
   ovn-chassis:
     charm: ch:ovn-chassis
-    channel: latest/edge
+    channel: 22.09/edge
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: zed/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: zed/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: zed/edge
 
   memcached:
     charm: ch:memcached
@@ -158,7 +158,7 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: quincy/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -166,7 +166,7 @@ applications:
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: quincy/edge
 
 relations:
 - - 'keystone:shared-db'
diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/kinetic-zed.yaml
similarity index 91%
rename from src/tests/bundles/mantic-bobcat.yaml
rename to src/tests/bundles/kinetic-zed.yaml
index 40a5765..43de170 100644
--- a/src/tests/bundles/mantic-bobcat.yaml
+++ b/src/tests/bundles/kinetic-zed.yaml
@@ -1,48 +1,48 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: &series mantic
+series: &series kinetic
 
 applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   gnocchi-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   neutron-api-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   placement-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   watcher-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
-    channel: latest/edge
+    channel: 8.0/edge
     num_units: 3
 
   rabbitmq-server:
     charm: ch:rabbitmq-server
-    channel: latest/edge
+    channel: 3.9/edge
     num_units: 1
 
   keystone:
     charm: ch:keystone
-    channel: latest/edge
+    channel: zed/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       openstack-origin: *openstack-origin
       network-manager: Neutron
       debug: true
-    channel: latest/edge
+    channel: zed/edge
 
   neutron-api:
     charm: ch:neutron-api
@@ -78,21 +78,21 @@ applications:
       openstack-origin: *openstack-origin
       flat-network-providers: physnet1
       neutron-security-groups: true
-    channel: latest/edge
+    channel: zed/edge
 
   glance:
     charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   placement:
     charm: ch:placement
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   nova-compute:
     charm: ch:nova-compute
@@ -106,31 +106,31 @@ applications:
       debug: true
       config-flags: "compute_monitors=cpu.virt_driver"
       libvirt-image-backend: "rbd"
-    channel: latest/edge
+    channel: zed/edge
 
   vault:
     charm: ch:vault
     num_units: 1
-    channel: latest/edge
+    channel: 1.8/edge
 
   ovn-central:
     charm: ch:ovn-central
-    channel: latest/edge
+    channel: 22.09/edge
     num_units: 3
     options:
       source: *openstack-origin
 
   ovn-chassis:
     charm: ch:ovn-chassis
-    channel: latest/edge
+    channel: 22.09/edge
 
   neutron-api-plugin-ovn:
     charm: ch:neutron-api-plugin-ovn
-    channel: latest/edge
+    channel: zed/edge
 
   ceilometer:
     charm: ch:ceilometer
-    channel: latest/edge
+    channel: zed/edge
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -140,11 +140,11 @@ applications:
     num_units: 1
     options:
       openstack-origin: *openstack-origin
-    channel: latest/edge
+    channel: zed/edge
 
   ceilometer-agent:
     charm: ch:ceilometer-agent
-    channel: latest/edge
+    channel: zed/edge
 
   memcached:
     charm: ch:memcached
@@ -158,7 +158,7 @@ applications:
       osd-devices: '20G'
     options:
       source: *openstack-origin
-    channel: latest/edge
+    channel: quincy/edge
 
   ceph-mon:
     charm: ch:ceph-mon
@@ -166,7 +166,7 @@ applications:
     options:
       source: *openstack-origin
       monitor-count: '3'
-    channel: latest/edge
+    channel: quincy/edge
 
 relations:
 - - 'keystone:shared-db'
diff --git a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
index 59d3eef..3686948 100644
--- a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -7,6 +7,10 @@ applications:
     charm: ch:hacluster
     num_units: 0
     channel: latest/edge
+  nova-compute:
+    options:
+      cpu-mode: custom
+      cpu-model: SandyBridge
 relations:
 - - watcher
   - hacluster
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index c0ad3c2..1a473c4 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,2 +1,2 @@
-git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
-git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+git+https://github.com/juju/charm-helpers.git@stable/zed#egg=charmhelpers
+git+https://github.com/openstack/charms.openstack.git@stable/zed#egg=charms.openstack