diff --git a/roles/charm-build/tasks/main.yaml b/roles/charm-build/tasks/main.yaml
index f4e3bd7e..55029adc 100644
--- a/roles/charm-build/tasks/main.yaml
+++ b/roles/charm-build/tasks/main.yaml
@@ -12,6 +12,12 @@
     name: snapd
   become: true
 
+- name: nftables is installed
+  apt:
+    name: nftables
+  become: true
+  when: ansible_distribution_release == 'jammy'
+
 - name: lxd snap is installed
   snap:
     name: lxd
@@ -22,6 +28,11 @@
   command: lxd init --auto
   become: true
 
+- name: allow packets from lxd bridge
+  command: nft insert rule filter openstack-INPUT iif lxdbr0 accept
+  become: true
+  when: ansible_distribution_release == 'jammy'
+
 - name: current user is in lxd group
   user:
     name: "{{ ansible_user }}"
diff --git a/run_tox.sh b/run_tox.sh
index a82cf957..fc54fc40 100755
--- a/run_tox.sh
+++ b/run_tox.sh
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+set -o xtrace
 
 source common.sh
 
@@ -91,8 +93,7 @@ then
 	fi
 
 	push_common_files $charm || exit 1
-
-	pushd charms/$charm
+	pushd charms/$charm || exit 1
 	charmcraft -v pack || exit 1
 	if [[ -e "${charm}.charm" ]];
 	then
@@ -100,9 +101,10 @@ then
 		rm "${charm}.charm"
 	fi
 	echo "Renaming charm ${charm}_*.charm to ${charm}.charm"
-	mv ${charm}_*.charm ${charm}.charm
-	popd
 
+	mv ${charm}_*.charm ${charm}.charm
+
+	popd || exit 1
 	pop_common_files $charm || exit 1
 else
 	echo "tox argument should be one of pep8, py3, py310, py311, cover";
diff --git a/zuul.d/zuul.yaml b/zuul.d/zuul.yaml
index 245fdb9f..73045603 100644
--- a/zuul.d/zuul.yaml
+++ b/zuul.d/zuul.yaml
@@ -23,7 +23,7 @@
       juju_classic_mode: false
       microk8s_channel: 1.28-strict/stable
       microk8s_classic_mode: false
-      charmcraft_channel: 2.0/stable
+      charmcraft_channel: 2.x/stable
       publish_channels:
         keystone-k8s: 2023.2/edge
         glance-k8s: 2023.2/edge