diff --git a/Vagrantfile b/Vagrantfile
index 15e8d92..cfe8361 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -53,7 +53,7 @@ fi
 pacman --noconfirm -Su
 
 # Make sure Python, Docker and other needed packages are installed
-for PKG in docker gcc make pkgconf python
+for PKG in docker docker-buildx gcc make pkgconf python
 do
     pacman -Qqi "$PKG" > /dev/null || pacman --noconfirm -S "$PKG"
 done
@@ -84,7 +84,7 @@ cat > /etc/docker/daemon.json << EOF
 EOF
 systemctl enable --now docker
 gpasswd -a vagrant docker
-(docker images |grep -q '^archlinux ') || su vagrant -c 'docker build -t archlinux /vagrant/machines/archlinux'
+(docker images |grep -q '^archlinux ') || su vagrant -c 'docker docker-buildx build -t archlinux /vagrant/machines/archlinux'
 
 # Use vsyscall=emulate on the command line, for Debian 7 Wheezy
 if [ -e /boot/syslinux/syslinux.cfg ] && ! grep vsyscall=emulate /boot/syslinux/syslinux.cfg > /dev/null
diff --git a/machines/base_install/archlinux.sh b/machines/base_install/archlinux.sh
index 108a9bb..b4360a1 100755
--- a/machines/base_install/archlinux.sh
+++ b/machines/base_install/archlinux.sh
@@ -514,6 +514,7 @@ then
     pkg clinfo
     pkg codespell
     pkg cppcheck
+    pkg docker-buildx
     pkg docker-compose
     pkg earlyoom
     pkg flake8
diff --git a/machines/docker_build_run.sh b/machines/docker_build_run.sh
index a31c246..f4890bf 100755
--- a/machines/docker_build_run.sh
+++ b/machines/docker_build_run.sh
@@ -104,9 +104,9 @@ build_and_run() {
     then
         if "$DO_PRETEND"
         then
-            echo "docker build -f 'Dockerfile-$BASE_NAME' -t '$IMAGE_NAME' .."
+            echo "docker buildx build -f 'Dockerfile-$BASE_NAME' -t '$IMAGE_NAME' .."
         else
-            docker build -f "Dockerfile-$BASE_NAME" -t "$IMAGE_NAME" .. || return $?
+            docker buildx build -f "Dockerfile-$BASE_NAME" -t "$IMAGE_NAME" .. || return $?
         fi
     fi