diff --git a/charmcraft.yaml b/charmcraft.yaml
index e34793a..00d4019 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -4,6 +4,8 @@ parts:
   charm:
     source: src/
     plugin: reactive
+    build-packages:
+      - libpython3-dev
     build-snaps:
       - charm
     build-environment:
diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml
deleted file mode 100644
index 4c49487..0000000
--- a/src/tests/bundles/kinetic-zed.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-series: &series kinetic
-
-applications:
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-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
-  mysql-innodb-cluster:
-    constraints: mem=3072M
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    channel: latest/edge
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
-  ovn-central:
-    charm: ch:ovn-central
-    num_units: 3
-    options:
-      source: *openstack-origin
-    channel: latest/edge
-  neutron-api-plugin-ovn:
-    charm: ../../../neutron-api-plugin-ovn.charm
-  hacluster-neutron-api:
-    charm: ch:hacluster
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    series: *series
-    num_units: 3
-    options:
-      # NOTE(fnordahl): At current state of upstream Neutron development this
-      # is a requirement.  Remove once fixed upstream.
-      enable-ml2-port-security: true
-      flat-network-providers: physnet1
-      neutron-security-groups: true
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      network-manager: Neutron
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  ovn-chassis:
-    charm: ch:ovn-chassis
-    channel: latest/edge
-  nova-compute:
-    constraints: "root-disk=20G mem=4G"
-    charm: ch:nova-compute
-    num_units: 2
-    options:
-      config-flags: default_ephemeral_format=ext4
-      enable-live-migration: true
-      enable-resize: true
-      migration-auth-type: ssh
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    channel: latest/edge
-relations:
-  - - hacluster-neutron-api:ha
-    - neutron-api:ha
-  - - neutron-api:amqp
-    - rabbitmq-server:amqp
-  - - neutron-api:neutron-api
-    - nova-cloud-controller:neutron-api
-  - - neutron-api:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:amqp
-    - rabbitmq-server:amqp
-  - - nova-compute:amqp
-    - rabbitmq-server:amqp
-  - - nova-cloud-controller:identity-service
-    - keystone:identity-service
-  - - nova-cloud-controller:cloud-compute
-    - nova-compute:cloud-compute
-  - - glance:identity-service
-    - keystone:identity-service
-  - - glance:amqp
-    - rabbitmq-server:amqp
-  - - nova-compute:image-service
-    - glance:image-service
-  - - nova-cloud-controller:image-service
-    - glance:image-service
-  - - placement:identity-service
-    - keystone:identity-service
-  - - placement:placement
-    - nova-cloud-controller:placement
-  - - neutron-api-plugin-ovn:neutron-plugin
-    - neutron-api:neutron-plugin-api-subordinate
-  - - ovn-central:certificates
-    - vault:certificates
-  - - ovn-central:ovsdb-cms
-    - neutron-api-plugin-ovn:ovsdb-cms
-  - - neutron-api:certificates
-    - vault:certificates
-  - - ovn-chassis:nova-compute
-    - nova-compute:neutron-plugin
-  - - ovn-chassis:certificates
-    - vault:certificates
-  - - ovn-chassis:ovsdb
-    - ovn-central:ovsdb
-  - - vault:certificates
-    - neutron-api-plugin-ovn:certificates
-  - - vault:certificates
-    - glance:certificates
-  - - vault:certificates
-    - keystone:certificates
-  - - vault:certificates
-    - nova-cloud-controller:certificates
-  - - vault:certificates
-    - placement:certificates
-  - ["keystone:shared-db", "keystone-mysql-router:shared-db"]
-  - ["glance:shared-db", "glance-mysql-router:shared-db"]
-  - ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"]
-  - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"]
-  - ["placement:shared-db", "placement-mysql-router:shared-db"]
-  - ["vault:shared-db", "vault-mysql-router:shared-db"]
-  - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
-  - ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
-  - ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
-  - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
-  - ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
-  - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"]
diff --git a/src/tests/bundles/overlays/jammy-yoga.yaml.j2 b/src/tests/bundles/overlays/jammy-yoga.yaml.j2
deleted file mode 120000
index b6c086c..0000000
--- a/src/tests/bundles/overlays/jammy-yoga.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-ha.j2
\ No newline at end of file
diff --git a/src/tests/bundles/overlays/jammy-zed.yaml.j2 b/src/tests/bundles/overlays/jammy-zed.yaml.j2
deleted file mode 120000
index b6c086c..0000000
--- a/src/tests/bundles/overlays/jammy-zed.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-ha.j2
\ No newline at end of file
diff --git a/src/tests/bundles/overlays/kinetic-zed.yaml.j2 b/src/tests/bundles/overlays/kinetic-zed.yaml.j2
deleted file mode 120000
index b6c086c..0000000
--- a/src/tests/bundles/overlays/kinetic-zed.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-ha.j2
\ No newline at end of file
diff --git a/src/tests/bundles/overlays/ha.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
similarity index 100%
rename from src/tests/bundles/overlays/ha.j2
rename to src/tests/bundles/overlays/local-charm-overlay.yaml.j2
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 2ac6937..74ad1c7 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -8,7 +8,6 @@ gate_bundles:
 
 dev_bundles:
 - jammy-antelope
-- kinetic-zed
 - lunar-antelope
 
 target_deploy_status:
@@ -37,5 +36,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - kinetic-zed
     - lunar-antelope
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 4c7ef04..bb07280 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -2,7 +2,7 @@ zipp<2.0.0
 oslo_config
 oslo_i18n
 poetry-core
-flit_core==3.7.1
+flit_core
 importlib_metadata<3.1.1
 
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack