diff --git a/.circleci/config.yml b/.circleci/config.yml
index d260b0b..b78fdb2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,7 +49,7 @@ jobs:
       - CI: "true"
       - BUILDKIT_PROGRESS: plain
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202104-01
     steps:
     - checkout
     - run: ./.circleci/linux_circle_vm_setup.sh
diff --git a/.circleci/linux_circle_vm_setup.sh b/.circleci/linux_circle_vm_setup.sh
index 12cadc4..b505a09 100755
--- a/.circleci/linux_circle_vm_setup.sh
+++ b/.circleci/linux_circle_vm_setup.sh
@@ -15,7 +15,11 @@ mkdir -p ~/.docker/cli-plugins
 mv docker-buildx ~/.docker/cli-plugins
 chmod a+x ~/.docker/cli-plugins/docker-buildx
 
-# We need this to get arm64 qemu to work https://github.com/docker/buildx/issues/138#issuecomment-569240559
-docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
+docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
 if ! docker buildx inspect ddev-builder-multi --bootstrap >/dev/null; then docker buildx create --name ddev-builder-multi; fi
 docker buildx use ddev-builder-multi
+docker buildx inspect --bootstrap
+
+which dpkg-split
+
diff --git a/Dockerfile b/Dockerfile
index 5f6aeae..1966290 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,21 @@
 ### ---------------------------base--------------------------------------
 ### Build the base Debian image that will be used in every other image
-FROM debian:buster-slim as base
+FROM debian:bullseye-slim as base
+
+RUN ls -l $(which dpkg-split) && ls -l $(which dpkg-deb)
+RUN for item in dpkg-split dpkg-deb; do \
+  if [ ! -f /usr/sbin/$item ]; then \
+    ln -sf /usr/bin/$item /usr/sbin/$item; \
+  fi; \
+done
+RUN for item in tar rm; do \
+  if [ ! -f /usr/sbin/$item ]; then \
+    ln -sf /bin/$item /usr/sbin/$item; \
+  fi; \
+done
+
+RUN ls -l /usr/sbin/dpkg-split /usr/sbin/dpkg-deb /usr/sbin/tar /usr/sbin/rm
+
 RUN apt-get -qq update
 RUN apt-get -qq install --no-install-recommends --no-install-suggests -y \
     apt-transport-https \
@@ -12,11 +27,9 @@ RUN apt-get -qq install --no-install-recommends --no-install-suggests -y \
     less \
     lsb-release \
     procps \
+    tree \
     vim \
     wget
-# Without c_rehash TLS fails (at least for curl) on arm/v7
-# See https://github.com/balena-io-library/base-images/issues/562
-RUN c_rehash
 #END base
 
 ### ---------------------------ddev-php-base--------------------------------------
@@ -73,7 +86,7 @@ ENV php74_amd64="apcu apcu-bc bcmath bz2 curl cli common fpm gd imagick intl jso
 ENV php74_arm64=$php74_amd64
 
 # As of php8.0 json is now part of core package and xmlrpc has been removed from PECL
-ENV php80_amd64="apcu bcmath bz2 curl cli common fpm gd imagick intl ldap mbstring memcached mysql opcache pgsql readline redis soap sqlite3 xdebug xhprof xml xmlrpc zip"
+ENV php80_amd64="apcu bcmath bz2 curl cli common fpm gd imagick intl ldap mbstring memcached mysql opcache pgsql readline redis soap sqlite3 uploadprogress xdebug xhprof xml xmlrpc zip"
 ENV php80_arm64=$php80_amd64
 
 RUN for v in $PHP_VERSIONS; do \