diff --git a/.zuul.yaml b/.zuul.yaml
index 23bf5f6..fd20909 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-zed-jobs
+      - openstack-python3-charm-jobs
       - openstack-cover-jobs
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 0604425..e34793a 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -23,3 +23,6 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/osci.yaml b/osci.yaml
index 8b2e400..1c10b05 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,7 +1,7 @@
 - project:
     templates:
       - charm-unit-jobs-py310
-      - charm-zed-functional-jobs
+      - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: aodh
diff --git a/src/config.yaml b/src/config.yaml
index f4c1b91..0a403ff 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -22,4 +22,4 @@ options:
     description: |
       Comma separated list of nagios servicegroups for the service checks.
   openstack-origin:
-    default: zed
+    default: antelope
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 3eaa8db..5929813 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -15,6 +15,7 @@ tags:
 series:
 - jammy
 - kinetic
+- lunar
 subordinate: false
 requires:
   mongodb:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
new file mode 100644
index 0000000..1036fe4
--- /dev/null
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -0,0 +1,180 @@
+local_overlay_enabled: False
+
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-antelope
+
+series: jammy
+
+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:
+    series: focal
+
+# We specify machine placements for these to improve iteration
+# time, given that machine "0" comes up way before machine "7"
+applications:
+
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  aodh-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  gnocchi-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
+
+  aodh:
+    charm: ../../../aodh.charm
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '4'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+    channel: latest/edge
+
+  ceilometer:
+    charm: ch:ceilometer
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+    channel: latest/edge
+
+  ceph-osd:
+    charm: ch:ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    to:
+      - '7'
+      - '8'
+      - '9'
+    channel: latest/edge
+
+  ceph-mon:
+    charm: ch:ceph-mon
+    num_units: 3
+    options:
+      expected-osd-count: 3
+      monitor-count: '3'
+    to:
+      - '10'
+      - '11'
+      - '12'
+    channel: latest/edge
+
+  gnocchi:
+    charm: ch:gnocchi
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '13'
+    channel: latest/edge
+
+  memcached:
+    charm: ch:memcached
+    num_units: 1
+    # Note that holding memcached at focal as it's not available at jammy yet.
+    series: focal
+    to:
+      - '14'
+
+  nrpe:
+    charm: ch:nrpe
+    channel: latest/edge
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+
+  - - 'aodh:shared-db'
+    - 'aodh-mysql-router:shared-db'
+  - - 'aodh-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'aodh:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'aodh:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'ceilometer:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'ceilometer:identity-credentials'
+    - 'keystone:identity-credentials'
+
+  - - 'ceilometer:identity-notifications'
+    - 'keystone:identity-notifications'
+
+  - - 'ceilometer:metric-service'
+    - 'gnocchi:metric-service'
+
+  - - 'gnocchi:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'gnocchi:shared-db'
+    - 'gnocchi-mysql-router:shared-db'
+  - - 'gnocchi-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'gnocchi:storage-ceph'
+    - 'ceph-mon:client'
+
+  - - 'gnocchi:coordinator-memcached'
+    - 'memcached:cache'
+
+  - - 'aodh:nrpe-external-master'
+    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/lunar-antelope.yaml
similarity index 95%
rename from src/tests/bundles/jammy-yoga.yaml
rename to src/tests/bundles/lunar-antelope.yaml
index 2bf2be1..fff2e22 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/lunar-antelope.yaml
@@ -3,7 +3,7 @@ local_overlay_enabled: False
 variables:
   openstack-origin: &openstack-origin distro
 
-series: jammy
+series: lunar
 
 machines:
   0:
@@ -62,8 +62,6 @@ applications:
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
-    options:
-      source: *openstack-origin
     to:
       - '4'
     channel: latest/edge
@@ -91,8 +89,6 @@ applications:
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
     to:
       - '7'
       - '8'
@@ -105,7 +101,6 @@ applications:
     options:
       expected-osd-count: 3
       monitor-count: '3'
-      source: *openstack-origin
     to:
       - '10'
       - '11'
@@ -124,7 +119,7 @@ applications:
   memcached:
     charm: ch:memcached
     num_units: 1
-    # Note that holding memcached at focal as it's not available at jammy yet.
+    # Note that holding memcached at focal as it's not available at lunar yet.
     series: focal
     to:
       - '14'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 5427c46..fc71ac3 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,11 +1,11 @@
 charm_name: aodh
 
 gate_bundles:
-  - jammy-yoga
-dev_bundles:
-  - jammy-yoga
   - jammy-zed
+dev_bundles:
+  - jammy-antelope
   - kinetic-zed
+  - lunar-antelope
 smoke_bundles:
   - jammy-yoga
 tests:
@@ -26,6 +26,7 @@ tests_options:
   force_deploy:
     # nrpe charm doesn't support jammy+ and needs to be force installed
     # https://bugs.launchpad.net/charm-nrpe/+bug/1968008
-    - jammy-yoga
     - jammy-zed
+    - jammy-antelope
     - kinetic-zed
+    - lunar-antelope
diff --git a/tox.ini b/tox.ini
index 854d8be..c11375e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,7 @@ allowlist_externals =
     charmcraft
     bash
     tox
-    rename.sh
+    {toxinidir}/rename.sh
 deps =
     -r{toxinidir}/requirements.txt