diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh
index 92a032e..9992def 100755
--- a/.github/workflows/bootstrap-deps.sh
+++ b/.github/workflows/bootstrap-deps.sh
@@ -71,7 +71,7 @@ case "${1}" in
     ;;
     *)
         apt-get update -qq
-        apt-get install -yqq autoconf automake build-essential curl cmake dpkg-dev file git jq libglib2.0-dev-bin libtool lsb-release make meson gperf patchelf
+        apt-get install -yqq autoconf automake build-essential curl cmake dpkg-dev file git jq libffi-dev libglib2.0-dev-bin libreadline-dev libtool lsb-release make meson gperf patchelf uuid-dev zlib1g-dev
 
         linux_arch=$(get_linux_deb_arch "${1}")
         release=$(lsb_release -cs 2>/dev/null)
@@ -111,7 +111,7 @@ case "${1}" in
         elif [ "${1}" = "win32" ] || [ "${1}" = "win64" ]; then
             dpkg --add-architecture i386
             apt-get update -qq
-            apt-get install -yqq autopoint libffi-dev libreadline-dev mingw-w64 uuid-dev zlib1g-dev
+            apt-get install -yqq autopoint mingw-w64
             if [ "$(lsb_release -si 2>/dev/null)" = "Debian" ]; then
                 apt-get install -yqq wine wine32 wine64
             else
@@ -120,15 +120,10 @@ case "${1}" in
         fi
 
         case "${release}" in
-            "bionic"|"focal")
-                apt-get install -yqq python3-pkg-resources
-                curl -sOL https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/meson_0.56.0-1kxstudio4_all.deb
-                if [ "${release}" = "bionic" ]; then
-                    curl -sOL https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/cmake_3.13.4-1kxstudio1_$(dpkg-architecture -qDEB_HOST_ARCH).deb
-                    curl -sOL https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/cmake-data_3.13.4-1kxstudio1_all.deb
-                fi
-                dpkg -i *.deb
-                rm *.deb
+            "bionic"|"bullseye"|"focal")
+                apt-get install -yqq --no-install-recommends python3-pip
+                pip3 install --isolated --upgrade --no-cache-dir --force-reinstall pip
+                pip3 install --isolated --upgrade --no-cache-dir --force-reinstall cmake meson
             ;;
         esac
 
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 2c14e3f..e653e50 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -237,19 +237,18 @@ jobs:
             container: debian:12
             os: ubuntu-latest
           # ubuntu:18.04
-          # FIXME needs CMake 3.15
-          #- target: linux-aarch64
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
-          #- target: linux-armhf
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
-          #- target: linux-i686
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
-          #- target: linux-x86_64
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
+          - target: linux-aarch64
+            container: ubuntu:18.04
+            os: ubuntu-latest
+          - target: linux-armhf
+            container: ubuntu:18.04
+            os: ubuntu-latest
+          - target: linux-i686
+            container: ubuntu:18.04
+            os: ubuntu-latest
+          - target: linux-x86_64
+            container: ubuntu:18.04
+            os: ubuntu-latest
           # ubuntu:20.04
           - target: linux-aarch64
             container: ubuntu:20.04
@@ -795,13 +794,12 @@ jobs:
           - target: macos-universal-10.15
             os: macos-12
           # debian 11
-          # FIXME debian:11 needs meson 0.58
-          #- target: linux-x86_64
-            #container: debian:11
-            #os: ubuntu-latest
-          #- target: win64
-            #container: debian:11
-            #os: ubuntu-latest
+          - target: linux-x86_64
+            container: debian:11
+            os: ubuntu-latest
+          - target: win64
+            container: debian:11
+            os: ubuntu-latest
           # debian 12
           - target: linux-x86_64
             container: debian:12
@@ -811,16 +809,13 @@ jobs:
             #container: debian:12
             #os: ubuntu-latest
           # ubuntu 18.04
-          # FIXME ubuntu:18.04 needs CMake 3.15
-          # FIXME ubuntu:18.04 needs meson 0.58
-          #- target: linux-x86_64
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
+          - target: linux-x86_64
+            container: ubuntu:18.04
+            os: ubuntu-latest
           # ubuntu 20.04
-          # FIXME ubuntu:20.04 needs meson 0.58
-          #- target: linux-x86_64
-            #container: ubuntu:20.04
-            #os: ubuntu-latest
+          - target: linux-x86_64
+            container: ubuntu:20.04
+            os: ubuntu-latest
           # ubuntu 22.04
           - target: linux-x86_64
             container: ubuntu:22.04
diff --git a/bootstrap-mod.sh b/bootstrap-mod.sh
index 2707194..69bd650 100755
--- a/bootstrap-mod.sh
+++ b/bootstrap-mod.sh
@@ -29,7 +29,10 @@ export PAWPAW_MODAUDIO=1
 ./bootstrap-jack2.sh "${target}"
 ./bootstrap-plugins.sh "${target}"
 ./bootstrap-python.sh "${target}"
-./bootstrap-qt.sh "${target}"
+
+if [ -z "${PAWPAW_SKIP_QT}" ]; then
+    ./bootstrap-qt.sh "${target}"
+fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # source setup code
@@ -152,6 +155,12 @@ fi
 
 build_waf lvtk1 "${LVTK1_VERSION}" "${LVTK1_EXTRAFLAGS}"
 
+# ---------------------------------------------------------------------------------------------------------------------
+
+if [ -n "${PAWPAW_SKIP_PYTHON_MODULES}" ]; then
+    exit 0
+fi
+
 # ---------------------------------------------------------------------------------------------------------------------
 # aggdraw