diff --git a/raspi0w.yaml b/raspi0w.yaml
index 72a5b28..92a2f89 100644
--- a/raspi0w.yaml
+++ b/raspi0w.yaml
@@ -51,7 +51,7 @@ steps:
   #   https://github.com/raspberrypi/firmware/issues/846
   #   Also, this package contains a Raspberry Pi 3-specific firmware file
   #   required by the WiFi driver.
-  - qemu-debootstrap: sid
+  - qemu-debootstrap: buster
     mirror: http://deb.debian.org/debian
     target: /
     arch: armel
@@ -65,7 +65,7 @@ steps:
   # debootstrap is fixed
   - chroot: /
     shell: |
-      echo 'deb http://deb.debian.org/debian sid main contrib non-free' > /etc/apt/sources.list
+      echo 'deb http://deb.debian.org/debian buster main contrib non-free' > /etc/apt/sources.list
       apt-get update
     unless: rootfs_unpacked
 
diff --git a/raspi1.yaml b/raspi1.yaml
index 7331776..7f4a5a2 100644
--- a/raspi1.yaml
+++ b/raspi1.yaml
@@ -79,7 +79,7 @@ steps:
     - wireless-tools
     - wpasupplicant
     - raspi3-firmware
-    - linux-image-marvell
+    - linux-image-rpi
     tag: /
     unless: rootfs_unpacked
 
@@ -112,10 +112,10 @@ steps:
       ln -s /etc/systemd/system/rpi3-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi3-generate-ssh-host-keys.service"
       rm -f ${ROOT?}/etc/ssh/ssh_host_*_key*
 
-      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-b.dtb      -O "${ROOT?}/boot/bcm2708-rpi-0-w.dtb"
-      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-b-plus.dtb -O "${ROOT?}/boot/bcm2708-rpi-0-w.dtb"
-      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-0-w.dtb    -O "${ROOT?}/boot/bcm2708-rpi-0-w.dtb"
-      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-cm.dtb    -O "${ROOT?}/boot/bcm2708-rpi-0-w.dtb"
+      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-b.dtb      -O "${ROOT?}/boot/firmware/bcm2708-rpi-b.dtb"
+      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-b-plus.dtb -O "${ROOT?}/boot/firmware/bcm2708-rpi-b-plus.dtb"
+      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-0-w.dtb    -O "${ROOT?}/boot/firmware/bcm2708-rpi-0-w.dtb"
+      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-cm.dtb     -O "${ROOT?}/boot/firmware/bcm2708-rpi-cm.dtb"
 
       cat >> "${ROOT?}/etc/motd" <<'EOT'
 
diff --git a/raspi1_uboot.yaml b/raspi1_uboot.yaml
new file mode 100644
index 0000000..96e2c84
--- /dev/null
+++ b/raspi1_uboot.yaml
@@ -0,0 +1,182 @@
+# See https://wiki.debian.org/RaspberryPi3 for known issues and more details.
+
+steps:
+  - mkimg: "{{ output }}"
+    size: 1500M
+
+  - mklabel: msdos
+    device: "{{ output }}"
+
+  - mkpart: primary
+    fs-type: 'fat32'
+    device: "{{ output }}"
+    start: 0%
+    end: 20%
+    tag: /boot
+
+  - mkpart: primary
+    device: "{{ output }}"
+    start: 20%
+    end: 100%
+    tag: /
+
+  - kpartx: "{{ output }}"
+
+  - mkfs: vfat
+    partition: /boot
+    label: RASPIFIRM
+
+  - mkfs: ext4
+    partition: /
+    label: RASPIROOT
+
+  - mount: /
+
+  - mount: /boot
+    mount-on: /
+    dirname: '/boot/firmware'
+
+  - unpack-rootfs: /
+
+  # We need to use Debian buster (currently testing) instead of Debian stretch
+  # (currently stable) for:
+  #
+  # linux ≥ 4.14
+  #   Which includes the sdhost driver for faster SD card access and making the
+  #   WiFi chip available, and has the WiFi driver enabled.
+  #
+  # raspi3-firmware ≥ 1.20171201-1
+  #   Which includes a recent enough firmware version to correctly pass the MAC
+  #   address to the kernel. This is a regression with Linux ≥ 4.12, see
+  #   https://github.com/raspberrypi/firmware/issues/846
+  #   Also, this package contains a Raspberry Pi 3-specific firmware file
+  #   required by the WiFi driver.
+  - qemu-debootstrap: buster
+    mirror: http://deb.debian.org/debian
+    target: /
+    arch: armel
+    components:
+    - main
+    - contrib
+    - non-free
+    unless: rootfs_unpacked
+
+  # TODO(https://bugs.debian.org/877855): remove this workaround once
+  # debootstrap is fixed
+  - chroot: /
+    shell: |
+      echo 'deb http://deb.debian.org/debian buster main contrib non-free' > /etc/apt/sources.list
+      echo 'deb http://deb.debian.org/debian experimental main contrib non-free' >> /etc/apt/sources.list
+      echo 'APT::Default-Release "Buster";' > /etc/apt/apt.conf.d/08default-release
+      apt-get update
+    unless: rootfs_unpacked
+
+  - apt: install
+    packages:
+    - ssh
+    - parted
+    - dosfstools
+    # Contains /lib/firmware/brcm/brcmfmac43430-sdio.bin (required for WiFi).
+    - firmware-brcm80211
+    - wireless-tools
+    - wpasupplicant
+    # - raspi3-firmware
+    # linux-image >= 5.0.0 is needed (hence the addition of
+    # experimental above and the chrooted command below)
+    # - linux-image-rpi
+    tag: /
+    unless: rootfs_unpacked
+
+  - apt: install
+    packages:
+    - u-boot-rpi
+    - u-boot-menu
+    tag: /
+
+  - chroot: /
+    shell: |
+      cat > /etc/default/u-boot <<'EOF'
+      ## /etc/default/u-boot - configuration file for
+      ## u-boot-update(8)
+
+      U_BOOT_UPDATE="true"
+
+      U_BOOT_ALTERNATIVES="default recovery"
+      U_BOOT_DEFAULT="l0"
+      U_BOOT_ENTRIES="all"
+      U_BOOT_MENU_LABEL="Debian GNU/Linux"
+      U_BOOT_PARAMETERS="root=/dev/mmcblk0p2 ro rootwait console=tty0"
+      U_BOOT_ROOT=""
+      U_BOOT_TIMEOUT="50"
+      U_BOOT_FDT="bcm2835-rpi-zero-w.dts"
+      #U_BOOT_FDT_DIR="/boot/dtbs/"
+      EOF
+      apt-get -y -t experimental install raspi3-firmware
+      # apt-get -y -t experimental install linux-image-5.0.0-trunk-rpi
+      apt-get -y install linux-image-rpi
+
+  - cache-rootfs: /
+    unless: rootfs_unpacked
+
+  - shell: |
+      echo "rpi-z" > "${ROOT?}/etc/hostname"
+
+      # '..VyaTFxP8kT6' is crypt.crypt('raspberry', '..')
+      sed -i 's,root:[^:]*,root:..VyaTFxP8kT6,' "${ROOT?}/etc/shadow"
+
+      sed -i 's,#PermitRootLogin prohibit-password,PermitRootLogin yes,g' "${ROOT?}/etc/ssh/sshd_config"
+
+      install -m 644 -o root -g root fstab "${ROOT?}/etc/fstab"
+
+      install -m 644 -o root -g root eth0 "${ROOT?}/etc/network/interfaces.d/eth0"
+
+      mkdir -p "${ROOT?}/etc/iptables"
+      install -m 644 -o root -g root rules.v4 "${ROOT?}/etc/iptables/rules.v4"
+      install -m 644 -o root -g root rules.v6 "${ROOT?}/etc/iptables/rules.v6"
+
+      install -m 755 -o root -g root rpi3-resizerootfs "${ROOT?}/usr/sbin/rpi3-resizerootfs"
+      install -m 644 -o root -g root rpi3-resizerootfs.service "${ROOT?}/etc/systemd/system"
+      mkdir -p "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/"
+      ln -s /etc/systemd/system/rpi3-resizerootfs.service "${ROOT?}/etc/systemd/system/systemd-remount-fs.service.requires/rpi3-resizerootfs.service"
+
+      install -m 644 -o root -g root rpi3-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system"
+      mkdir -p "${ROOT?}/etc/systemd/system/multi-user.target.requires/"
+      ln -s /etc/systemd/system/rpi3-generate-ssh-host-keys.service "${ROOT?}/etc/systemd/system/multi-user.target.requires/rpi3-generate-ssh-host-keys.service"
+      rm -f ${ROOT?}/etc/ssh/ssh_host_*_key*
+
+      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-b.dtb      -O "${ROOT?}/boot/firmware/bcm2708-rpi-b.dtb"
+      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-b-plus.dtb -O "${ROOT?}/boot/firmware/bcm2708-rpi-b-plus.dtb"
+      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-0-w.dtb    -O "${ROOT?}/boot/firmware/bcm2708-rpi-0-w.dtb"
+      wget https://github.com/raspberrypi/firmware/blob/master/boot/bcm2708-rpi-cm.dtb     -O "${ROOT?}/boot/firmware/bcm2708-rpi-cm.dtb"
+
+      cat >> "${ROOT?}/etc/motd" <<'EOT'
+
+      Please change the root password by running passwd
+      EOT
+    root-fs: /
+
+  # Clean up archive cache (likely not useful) and lists (likely outdated) to
+  # reduce image size by several hundred megabytes.
+  - chroot: /
+    shell: |
+      apt-get clean
+      rm -rf /var/lib/apt/lists
+
+  # Modify the kernel commandline we take from the firmware to boot from
+  # the partition labeled raspiroot instead of forcing it to mmcblk0p2
+  - chroot: /
+    shell: |
+      ls -aR /boot
+      sed -i 's/.dev.mmcblk0p2/LABEL=RASPIROOT/' /boot/firmware/cmdline.txt
+
+  - chroot: /
+    shell: |
+      cp /usr/lib/u-boot/rpi_0_w/u-boot.bin /boot/firmware/
+      sed -i s/^kernel=.*/kernel=u-boot.bin/ /boot/firmware/config.txt
+      u-boot-update
+
+  # TODO(https://github.com/larswirzenius/vmdb2/issues/24): remove once vmdb
+  # clears /etc/resolv.conf on its own.
+  - shell: |
+      rm "${ROOT?}/etc/resolv.conf"
+    root-fs: /
diff --git a/raspi2.yaml b/raspi2.yaml
index 4b30d9c..2c8b9f3 100644
--- a/raspi2.yaml
+++ b/raspi2.yaml
@@ -74,8 +74,6 @@ steps:
     - ssh
     - parted
     - dosfstools
-    # Contains /lib/firmware/brcm/brcmfmac43430-sdio.bin (required for WiFi).
-    - firmware-brcm80211
     - wireless-tools
     - wpasupplicant
     - raspi3-firmware