diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 82a30790..d245a68d 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -75,7 +75,7 @@ jobs:
       - name: Run integration tests
         run: |
           sg snap_microk8s -c "juju add-model knative-test"
-          sg snap_microk8s -c "tox -vve integration -- --model knative-test --destructive-mode"
+          sg snap_microk8s -c "tox -vve integration -- --model knative-test"
 
       - run: kubectl get all -A
         if: failure()
@@ -108,7 +108,7 @@ jobs:
       - name: Run integration tests
         run: |
           sg snap_microk8s -c "juju add-model cos-test"
-          sg snap_microk8s -c "tox -vve cos-integration -- --model cos-test --destructive-mode"
+          sg snap_microk8s -c "tox -vve cos-integration -- --model cos-test"
 
       - run: kubectl get pod/prometheus-k8s-0 -n knative-test -o=jsonpath='{.status}'
         if: failure()
diff --git a/charms/knative-eventing/charmcraft.yaml b/charms/knative-eventing/charmcraft.yaml
index 9559a6d5..fd5823c3 100644
--- a/charms/knative-eventing/charmcraft.yaml
+++ b/charms/knative-eventing/charmcraft.yaml
@@ -12,4 +12,9 @@ bases:
 parts:
   charm:
     charm-python-packages: [setuptools, pip]
-    build-packages: [git]
+    # Following lines are needed due to https://github.com/canonical/charmcraft/issues/1722
+    build-snaps: [rustup]
+    build-packages: [pkg-config, libffi-dev, libssl-dev]
+    override-build: |
+      rustup default stable
+      craftctl default
diff --git a/charms/knative-operator/charmcraft.yaml b/charms/knative-operator/charmcraft.yaml
index 4bea96ca..80bfb324 100644
--- a/charms/knative-operator/charmcraft.yaml
+++ b/charms/knative-operator/charmcraft.yaml
@@ -11,3 +11,9 @@ bases:
 parts:
   charm:
     charm-python-packages: [setuptools, pip]
+    # Following lines are needed due to https://github.com/canonical/charmcraft/issues/1722
+    build-snaps: [rustup]
+    build-packages: [pkg-config, libffi-dev, libssl-dev]
+    override-build: |
+      rustup default stable
+      craftctl default
diff --git a/charms/knative-serving/charmcraft.yaml b/charms/knative-serving/charmcraft.yaml
index 9559a6d5..fd5823c3 100644
--- a/charms/knative-serving/charmcraft.yaml
+++ b/charms/knative-serving/charmcraft.yaml
@@ -12,4 +12,9 @@ bases:
 parts:
   charm:
     charm-python-packages: [setuptools, pip]
-    build-packages: [git]
+    # Following lines are needed due to https://github.com/canonical/charmcraft/issues/1722
+    build-snaps: [rustup]
+    build-packages: [pkg-config, libffi-dev, libssl-dev]
+    override-build: |
+      rustup default stable
+      craftctl default