diff --git a/Makefile b/Makefile
index f3830a0..f42d38c 100644
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,7 @@ raspi_base_bullseye.yaml: raspi_master.yaml
 	cat raspi_master.yaml | \
 	sed "s/__RELEASE__/bullseye/" |\
 	sed "s/__FIRMWARE_PKG__/raspi-firmware/" | \
+	sed "/touch \/etc\/machine-id/d" | \
 	grep -v "__OTHER_APT_ENABLE__" |\
 	grep -v "__FIX_FIRMWARE_PKG_NAME__" |\
 	sed "s/__SECURITY_SUITE__/bullseye-security/" > $@
diff --git a/raspi_master.yaml b/raspi_master.yaml
index d8ffae6..9a8cb3f 100644
--- a/raspi_master.yaml
+++ b/raspi_master.yaml
@@ -161,6 +161,9 @@ steps:
   #   populated during installation.
   #
   # Note this will also trigger ConditionFirstBoot=yes for systemd.
+  # On Buster, /etc/machine-id should be an emtpy file, not an absent file
+  # On Bullseye, /etc/machine-id should not exist in an image
   - chroot: /
     shell: |
       rm -f /etc/machine-id /var/lib/dbus/machine-id
+      touch /etc/machine-id