diff --git a/charmcraft.yaml b/charmcraft.yaml
index 00d4019..47f40c2 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -4,6 +4,9 @@ parts:
   charm:
     source: src/
     plugin: reactive
+    reactive-charm-build-arguments:
+      - --binary-wheels-from-source
+      - --verbose
     build-packages:
       - libpython3-dev
     build-snaps:
@@ -21,10 +24,91 @@ bases:
     run-on:
       - name: ubuntu
         channel: "22.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
+        architectures:
+          - amd64
       - name: ubuntu
         channel: "22.10"
-        architectures: [amd64, s390x, ppc64el, arm64]
+        architectures:
+          - amd64
+  - build-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures:
+          - s390x
+    run-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures:
+          - s390x
+      - name: ubuntu
+        channel: "22.10"
+        architectures:
+          - s390x
+  - build-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures:
+          - ppc64el
+    run-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures:
+          - ppc64el
+      - name: ubuntu
+        channel: "22.10"
+        architectures:
+          - ppc64el
+  - build-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures:
+          - arm64
+    run-on:
+      - name: ubuntu
+        channel: "22.04"
+        architectures:
+          - arm64
+      - name: ubuntu
+        channel: "22.10"
+        architectures:
+          - arm64
+  - build-on:
       - name: ubuntu
         channel: "23.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
+        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
diff --git a/rename.sh b/rename.sh
deleted file mode 100755
index d0c35c9..0000000
--- a/rename.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
-echo "renaming ${charm}_*.charm to ${charm}.charm"
-echo -n "pwd: "
-pwd
-ls -al
-echo "Removing bad downloaded charm maybe?"
-if [[ -e "${charm}.charm" ]];
-then
-    rm "${charm}.charm"
-fi
-echo "Renaming charm here."
-mv ${charm}_*.charm ${charm}.charm
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
index 736224e..f412017 100644
--- a/src/tests/bundles/jammy-antelope.yaml
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -44,7 +44,7 @@ applications:
       source: *openstack-origin
     channel: latest/edge
   neutron-api-plugin-ovn:
-    charm: ../../../neutron-api-plugin-ovn.charm
+    charm: ../../../neutron-api-plugin-ovn_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
   hacluster-neutron-api:
     charm: ch:hacluster
     channel: latest/edge
diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-zed.yaml
index b85250c..b90410c 100644
--- a/src/tests/bundles/jammy-zed.yaml
+++ b/src/tests/bundles/jammy-zed.yaml
@@ -44,7 +44,7 @@ applications:
       source: *openstack-origin
     channel: latest/edge
   neutron-api-plugin-ovn:
-    charm: ../../../neutron-api-plugin-ovn.charm
+    charm: ../../../neutron-api-plugin-ovn_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
   hacluster-neutron-api:
     charm: ch:hacluster
     channel: latest/edge
diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/lunar-antelope.yaml
index 55f5e23..d6e8395 100644
--- a/src/tests/bundles/lunar-antelope.yaml
+++ b/src/tests/bundles/lunar-antelope.yaml
@@ -44,7 +44,7 @@ applications:
       source: *openstack-origin
     channel: latest/edge
   neutron-api-plugin-ovn:
-    charm: ../../../neutron-api-plugin-ovn.charm
+    charm: ../../../neutron-api-plugin-ovn_ubuntu-23.04-amd64.charm
   hacluster-neutron-api:
     charm: ch:hacluster
     channel: latest/edge
diff --git a/tox.ini b/tox.ini
index c11375e..5c53393 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,12 +33,12 @@ allowlist_externals =
     charmcraft
     bash
     tox
-    {toxinidir}/rename.sh
 deps =
     -r{toxinidir}/requirements.txt
 
 [testenv:build]
 basepython = python3
+deps =
 # charmcraft clean is done to ensure that
 # `tox -e build` always performs a clean, repeatable build.
 # For faster rebuilds during development,
@@ -46,7 +46,6 @@ basepython = python3
 commands =
     charmcraft clean
     charmcraft -v pack
-    {toxinidir}/rename.sh
     charmcraft clean
 
 [testenv:build-reactive]