diff --git a/.github/common.env b/.github/common.env
index c1f43f7..91f1cb5 100644
--- a/.github/common.env
+++ b/.github/common.env
@@ -1,5 +1,5 @@
 # Shared common variables
 
-CI_IMAGE_VERSION=master-1408971201
+CI_IMAGE_VERSION=master-1571408207
 CI_TOXENV_ALL=py38,py39,py310,py311,py312
 CI_TOXENV_MASTER=py38-bst-master,py39-bst-master,py310-bst-master,py311-bst-master,py312-bst-master
diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml
index 48d1d83..f22b14b 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -30,9 +30,9 @@ services:
     <<: *tests-template
     image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:40-${CI_IMAGE_VERSION:-latest}
 
-  ubuntu-20.04:
+  ubuntu-22.04:
     <<: *tests-template
-    image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:20.04-${CI_IMAGE_VERSION:-latest}
+    image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:22.04-${CI_IMAGE_VERSION:-latest}
 
   # Ensure that tests also pass in the absence of a sandboxing tool
   fedora-missing-deps:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c20bb57..d76c512 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ concurrency:
 
 jobs:
   tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     continue-on-error: ${{ matrix.allow-failure || false }}
 
     strategy:
@@ -39,7 +39,7 @@ jobs:
           - debian-11
           - fedora-40
           - fedora-missing-deps
-          - ubuntu-20.04
+          - ubuntu-22.04
           - lint
           - mypy
 
@@ -59,7 +59,7 @@ jobs:
           ${GITHUB_WORKSPACE}/.github/run-ci.sh ${{ matrix.test-name }}
 
   docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -75,7 +75,7 @@ jobs:
           ${GITHUB_WORKSPACE}/.github/run-ci.sh docs
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: docs
           path: doc/build/html
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index cde4e5b..67ef1a4 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     name: Build documentation
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
         tar -C doc/build/html -zcf docs.tgz .
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: docs
         path: |
@@ -40,11 +40,11 @@ jobs:
 
   publish:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
 
     - name: Download artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         name: docs
         path: docs
diff --git a/.pylintrc b/.pylintrc
index 5bd9e47..f0cbe35 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -111,6 +111,7 @@ disable=
         too-many-lines,
         too-many-locals,
         too-many-nested-blocks,
+	too-many-positional-arguments,
         too-many-public-methods,
         too-many-statements,
         too-many-return-statements,
diff --git a/tests/bzr_wrapper b/tests/bzr_wrapper
new file mode 100755
index 0000000..27bf6b7
--- /dev/null
+++ b/tests/bzr_wrapper
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ -x "/usr/bin/bzr" ]; then
+
+    cat > "${1}/bzr" << 'EOF'
+#!/bin/bash
+
+export PATH=/usr/bin
+
+exec /usr/bin/bzr "$@"
+EOF
+
+    chmod +x "${1}/bzr"
+fi
diff --git a/tox.ini b/tox.ini
index 5d58934..5b97c50 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,7 @@ skip_missing_interpreters = true
 [testenv]
 commands =
     bst --version
+    ./tests/bzr_wrapper {envdir}/bin
     pytest --basetemp {envtmpdir} {posargs}
 deps =
     -rrequirements/test-requirements.txt
@@ -60,10 +61,11 @@ setenv =
     !master: BST_VERSION = 2.2.1
     master: BST_VERSION = master
 
-whitelist_externals =
+allowlist_externals =
     py{38,39,310,311,312}:
         mv
         mkdir
+	./tests/bzr_wrapper
 
 #
 # Code formatters
@@ -132,7 +134,7 @@ passenv =
     HOME
     LANG
     LC_ALL
-whitelist_externals =
+allowlist_externals =
     make