diff --git a/.zuul.yaml b/.zuul.yaml
index 2ac5521d..0cdd6573 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -157,7 +157,7 @@
       Default grenade job
 
       Usually grenade jobs should inherit from this job.
-    nodeset: openstack-single-node-bionic
+    nodeset: openstack-single-node-focal
     required-projects:
       # NOTE(andreaf) The devstack and grenade roles take care of setting up
       # repos on the right branch for this job.
@@ -362,4 +362,4 @@
     description: |
       Basic multinode grenade job
     parent: grenade
-    nodeset: openstack-two-node-bionic
+    nodeset: openstack-two-node-focal
diff --git a/projects/30_swift/upgrade.sh b/projects/30_swift/upgrade.sh
index 36897f67..38b67b1e 100755
--- a/projects/30_swift/upgrade.sh
+++ b/projects/30_swift/upgrade.sh
@@ -69,7 +69,7 @@ sudo chown -R $USER:${USER_GROUP} ${SWIFT_DATA_DIR}
 
 # Mount backing disk
 if ! egrep -q ${SWIFT_DATA_DIR}/drives/sdb1 /proc/mounts; then
-    sudo mount -t xfs -o nouuid,loop,noatime,nodiratime,nobarrier,logbufs=8  \
+    sudo mount -t xfs -o nouuid,loop,noatime,nodiratime,logbufs=8  \
         ${SWIFT_DATA_DIR}/drives/images/swift.img ${SWIFT_DATA_DIR}/drives/sdb1
 fi
 
diff --git a/save-state b/save-state
index 7ddb409d..bef79d6a 100755
--- a/save-state
+++ b/save-state
@@ -52,7 +52,9 @@ if [[ $(type -P iptables-save) != "" ]]; then
     sudo iptables-save >$SAVE_DIR/iptables.$BASE_RELEASE
 fi
 if [[ $(type -P ebtables) != "" ]]; then
-    sudo ebtables -t broute -L >$SAVE_DIR/ebtables-broute.$BASE_RELEASE
+    # FIXME: ebtables may be available, but based on nft, and broute
+    # is not available -> do not end the script because of this
+    sudo ebtables -t broute -L >$SAVE_DIR/ebtables-broute.$BASE_RELEASE || true
     sudo ebtables -t filter -L >$SAVE_DIR/ebtables-filter.$BASE_RELEASE
     sudo ebtables -t nat -L >$SAVE_DIR/ebtables-nat.$BASE_RELEASE
 fi