diff --git a/.zuul.yaml b/.zuul.yaml
index 23bf5f6..6997408 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,5 @@
 - project:
     templates:
-      - openstack-python3-charm-zed-jobs
+      - openstack-python3-charm-yoga-jobs
+      - openstack-python3-charm-jobs
       - openstack-cover-jobs
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 070bf49..5d66576 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -30,3 +30,9 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.10"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/config.yaml b/config.yaml
index 9a9b79e..870c923 100644
--- a/config.yaml
+++ b/config.yaml
@@ -5,7 +5,7 @@ options:
     description: Mon and OSD debug level. Max is 20.
   source:
     type: string
-    default: zed
+    default: distro
     description: |
       Optional configuration to support use of additional sources such as:
         - ppa:myteam/ppa
diff --git a/metadata.yaml b/metadata.yaml
index 78cef03..f67f4d3 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -11,6 +11,8 @@ tags:
   - misc
 series:
 - jammy
+- kinetic
+- lunar
 subordinate: false
 min-juju-version: 2.7.6
 extra-bindings:
diff --git a/osci.yaml b/osci.yaml
index fce5cb1..a6b65fb 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -9,6 +9,10 @@
           voting: false
       - ceph-iscsi-kinetic-quincy-ec:
           voting: false
+      - ceph-iscsi-lunar-quincy:
+          voting: false
+      - ceph-iscsi-lunar-quincy-ec:
+          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: ceph-iscsi
@@ -45,3 +49,20 @@
       - ceph-iscsi-jammy-quincy
     vars:
       tox_extra_args: -- kinetic-ec
+
+- job:
+    name: ceph-iscsi-lunar-quincy
+    parent: func-target
+    voting: false
+    dependencies:
+      - ceph-iscsi-jammy-quincy
+    vars:
+      tox_extra_args: -- lunar
+- job:
+    name: ceph-iscsi-lunar-quincy-ec
+    parent: func-target
+    voting: false
+    dependencies:
+      - ceph-iscsi-jammy-quincy
+    vars:
+      tox_extra_args: -- lunar-ec
diff --git a/tests/bundles/lunar-ec.yaml b/tests/bundles/lunar-ec.yaml
new file mode 100644
index 0000000..b9c9771
--- /dev/null
+++ b/tests/bundles/lunar-ec.yaml
@@ -0,0 +1,94 @@
+local_overlay_enabled: False
+series: lunar
+machines:
+  '0':
+  '1':
+  '2':
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+  '8':
+    constraints: mem=3072M
+  '9':
+    constraints: mem=3072M
+  '10':
+    constraints: mem=3072M
+  '11':
+  '12':
+  '13':
+  '14':
+  '15':
+applications:
+  ubuntu:
+    charm: cs:ubuntu
+    num_units: 3
+    to:
+      - '7'
+      - '14'
+      - '15'
+  ceph-iscsi:
+    charm: ../../ceph-iscsi.charm
+    num_units: 2
+    options:
+      gateway-metadata-pool: iscsi-foo-metadata
+      pool-type: erasure-coded
+      ec-profile-k: 4
+      ec-profile-m: 2
+    to:
+      - '0'
+      - '1'
+  ceph-osd:
+    charm: ch:ceph-osd
+    num_units: 6
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      osd-devices: '/dev/test-non-existent'
+    to:
+      - '0'
+      - '1'
+      - '2'
+      - '11'
+      - '12'
+      - '13'
+    channel: latest/edge
+  ceph-mon:
+    charm: ch:ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+    to:
+      - '3'
+      - '4'
+      - '5'
+    channel: latest/edge
+  vault:
+    num_units: 1
+    charm: ch:vault
+    to:
+      - '6'
+    channel: latest/edge
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    to:
+      - '8'
+      - '9'
+      - '10'
+    channel: latest/edge
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+relations:
+  - - 'ceph-mon:client'
+    - 'ceph-iscsi:ceph-client'
+  - - 'vault:certificates'
+    - 'ceph-iscsi:certificates'
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
diff --git a/tests/bundles/lunar.yaml b/tests/bundles/lunar.yaml
new file mode 100644
index 0000000..f9123b3
--- /dev/null
+++ b/tests/bundles/lunar.yaml
@@ -0,0 +1,95 @@
+local_overlay_enabled: False
+series: lunar
+machines:
+  '0':
+  '1':
+  '2':
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+  '8':
+    constraints: mem=3072M
+  '9':
+    constraints: mem=3072M
+  '10':
+    constraints: mem=3072M
+  '11':
+  '12':
+  '13':
+  '14':
+  '15':
+  '16':
+  '17':
+applications:
+  ubuntu:
+    charm: cs:ubuntu
+    num_units: 3
+    to:
+      - '7'
+      - '14'
+      - '15'
+  ceph-iscsi:
+    charm: ../../ceph-iscsi.charm
+    num_units: 4
+    options:
+      gateway-metadata-pool: iscsi-foo-metadata
+    to:
+      - '0'
+      - '1'
+      - '16'
+      - '17'
+  ceph-osd:
+    charm: ch:ceph-osd
+    num_units: 6
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      osd-devices: '/dev/test-non-existent'
+    to:
+      - '0'
+      - '1'
+      - '2'
+      - '11'
+      - '12'
+      - '13'
+    channel: latest/edge
+  ceph-mon:
+    charm: ch:ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+    to:
+      - '3'
+      - '4'
+      - '5'
+    channel: latest/edge
+  vault:
+    num_units: 1
+    charm: ch:vault
+    to:
+      - '6'
+    channel: latest/edge
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    to:
+      - '8'
+      - '9'
+      - '10'
+    channel: latest/edge
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+relations:
+  - - 'ceph-mon:client'
+    - 'ceph-iscsi:ceph-client'
+  - - 'vault:certificates'
+    - 'ceph-iscsi:certificates'
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'