diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..a850351
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,13 @@
+type: charm
+
+parts:
+  charm:
+    source: src/
+    plugin: reactive
+    build-snaps: [charm]
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64
diff --git a/metadata.yaml b/metadata.yaml
new file mode 120000
index 0000000..0768683
--- /dev/null
+++ b/metadata.yaml
@@ -0,0 +1 @@
+src/metadata.yaml
\ No newline at end of file
diff --git a/osci.yaml b/osci.yaml
index a2b913e..f38f353 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,11 +1,10 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
+      - charm-unit-jobs-py39
     check:
       jobs:
-      - bionic-basic
       - focal-basic
-      - hirsute-basic
       - impish-basic:
           voting: false
       - jammy-basic:
@@ -14,38 +13,33 @@
       needs_charm_build: true
       charm_build_name: pacemaker-remote
 
-- job:
-    name: bionic-basic
-    parent: func-target
-    dependencies: 
-      - osci-lint
-      - tox-py36
-      - tox-py38
-      - tox-py39
-    vars:
-      tox_extra_args: bionic-basic
 - job:
     name: focal-basic
     parent: func-target
-    dependencies: &smoke-jobs
-      - bionic-basic
+    dependencies:
+      - osci-lint
+      - tox-py38
+      - tox-py39
+      - charm-build
     vars:
       tox_extra_args: focal-basic
-- job:
-    name: hirsute-basic
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: hirsute-basic
 - job:
     name: impish-basic
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - osci-lint
+      - tox-py38
+      - tox-py39
+      - charm-build
     vars:
       tox_extra_args: impish-basic
 - job:
     name: jammy-basic
     parent: func-target
-    dependencies: *smoke-jobs
+    dependencies:
+      - osci-lint
+      - tox-py38
+      - tox-py39
+      - charm-build
     vars:
       tox_extra_args: jammy-basic
diff --git a/src/metadata.yaml b/src/metadata.yaml
index baa1194..7fb571e 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -7,10 +7,7 @@ description: |
 tags:
 - openstack
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 requires:
   juju-info:
diff --git a/src/tests/bundles/bionic-basic.yaml b/src/tests/bundles/bionic-basic.yaml
index 6239ef9..67a22b1 100644
--- a/src/tests/bundles/bionic-basic.yaml
+++ b/src/tests/bundles/bionic-basic.yaml
@@ -8,15 +8,16 @@ relations:
   - pacemaker-remote:pacemaker-remote
 applications:
   api:
-    charm: cs:bionic/ubuntu
+    charm: ch:ubuntu
     num_units: 3
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: latest/edge
   compute:
-    charm: cs:bionic/ubuntu
+    charm: ch:ubuntu
     num_units: 1
   pacemaker-remote:
     series: bionic
diff --git a/src/tests/bundles/focal-basic.yaml b/src/tests/bundles/focal-basic.yaml
index 1c9fbd3..6a28d73 100644
--- a/src/tests/bundles/focal-basic.yaml
+++ b/src/tests/bundles/focal-basic.yaml
@@ -3,17 +3,18 @@ series: focal
 applications:
 
   api:
-    charm: cs:focal/ubuntu
+    charm: ch:ubuntu
     num_units: 3
 
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: latest/edge
 
   compute:
-    charm: cs:focal/ubuntu
+    charm: ch:ubuntu
     num_units: 1
 
   pacemaker-remote:
diff --git a/src/tests/bundles/hirsute-basic.yaml b/src/tests/bundles/hirsute-basic.yaml
deleted file mode 100644
index abaa5f8..0000000
--- a/src/tests/bundles/hirsute-basic.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-series: hirsute
-
-applications:
-
-  api:
-    charm: cs:ubuntu
-    num_units: 3
-
-  hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
-    options:
-      corosync_transport: unicast
-      cluster_count: 3
-
-  compute:
-    charm: cs:ubuntu
-    num_units: 1
-
-  pacemaker-remote:
-    charm: pacemaker-remote
-    options:
-      enable-stonith: False
-      enable-resources: False
-
-relations:
-
-  - - 'compute:juju-info'
-    - 'pacemaker-remote:juju-info'
-
-  - - 'api:juju-info'
-    - 'hacluster:juju-info'
-
-  - - 'hacluster:pacemaker-remote'
-    - 'pacemaker-remote:pacemaker-remote'
diff --git a/src/tests/bundles/impish-basic.yaml b/src/tests/bundles/impish-basic.yaml
index 2f8326c..8b0fa9e 100644
--- a/src/tests/bundles/impish-basic.yaml
+++ b/src/tests/bundles/impish-basic.yaml
@@ -7,10 +7,11 @@ applications:
     num_units: 3
 
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: latest/edge
 
   compute:
     charm: cs:ubuntu
diff --git a/src/tests/bundles/jammy-basic.yaml b/src/tests/bundles/jammy-basic.yaml
index bd530b2..22eb1ae 100644
--- a/src/tests/bundles/jammy-basic.yaml
+++ b/src/tests/bundles/jammy-basic.yaml
@@ -7,10 +7,11 @@ applications:
     num_units: 3
 
   hacluster:
-    charm: cs:~openstack-charmers-next/hacluster
+    charm: ch:hacluster
     options:
       corosync_transport: unicast
       cluster_count: 3
+    channel: latest/edge
 
   compute:
     charm: cs:ubuntu
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index e83d1b3..4599949 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -7,16 +7,13 @@ configure:
   - zaza.charm_tests.noop.setup.basic_setup
 
 gate_bundles:
-  - bionic-basic
   - focal-basic
-  - hirsute-basic
   - impish-basic
 
 smoke_bundles:
   - focal-basic
 
 dev_bundles:
-  - hirsute-basic
   - impish-basic
   - jammy-basic
 
@@ -33,6 +30,5 @@ tests_options:
   force_deploy:
     # NOTE(lourot): cs:ubuntu doesn't support hirsute+ officially in its
     # metadata:
-    - hirsute-basic
     - impish-basic
     - jammy-basic