diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5b18b1a7..645579d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -49,3 +49,15 @@ jobs:
 
       - name: Run integration tests
         run: tox -e integration
+      - name: Archive charmcraft logs
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: charmcraft-logs
+          path: /home/runner/.local/state/charmcraft/log/*.log
+      - name: Archive juju crashdump
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: juju-crashdump
+          path: juju-crashdump-*.tar.xz
diff --git a/charmcraft.yaml b/charmcraft.yaml
index fe2da283..f1f611a5 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -7,8 +7,6 @@ bases:
   - build-on:
     - name: "ubuntu"
       channel: "20.04"
-    - name: "ubuntu"
-      channel: "22.04"
     run-on:
     - name: "ubuntu"
       channel: "20.04"
@@ -20,3 +18,4 @@ parts:
       - libssl-dev
       - rustc
       - cargo
+      - pkg-config
diff --git a/tox.ini b/tox.ini
index a9c13278..f5b08697 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,7 +76,7 @@ commands =
 [testenv:integration]
 description = Run integration tests
 deps =
-    juju
+    juju<3.1
     pytest
     pytest-operator
     -r{toxinidir}/requirements.txt