diff --git a/charmcraft.yaml b/charmcraft.yaml
index 754306b..67a47ce 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -79,38 +79,6 @@ bases:
       - name: ubuntu
         channel: "22.04"
         architectures: [arm64]
-  - build-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64]
-    run-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [amd64]
-  - build-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [s390x]
-    run-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [s390x]
-  - build-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [ppc64el]
-    run-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [ppc64el]
-  - build-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [arm64]
-    run-on:
-      - name: ubuntu
-        channel: "23.04"
-        architectures: [arm64]
   - build-on:
       - name: ubuntu
         channel: "23.10"
diff --git a/osci.yaml b/osci.yaml
index 281d9f0..80424e2 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -6,24 +6,8 @@
       jobs:
       - focal
       - jammy
-# Lunar is set to optional due to issue with charmcraft when packing from Lunar
-      - lunar:
-          voting: false
-      - mantic:
-          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: magpie
       build_type: charmcraft
       charmcraft_channel: 2.x/edge
-
-- job:
-    name: mantic
-    parent: func-target
-    dependencies:
-      - osci-lint
-      - name: tox-py310
-        soft: true
-      - charm-build
-    vars:
-      tox_extra_args: '-- mantic'