diff --git a/boot/cmdline.txt b/boot/cmdline.txt
index 298c1cd..c994507 100644
--- a/boot/cmdline.txt
+++ b/boot/cmdline.txt
@@ -1 +1 @@
-root=LABEL=__DISTRO__ rootfstype=ext4 rw rootwait console=ttyTitania0 console=tty0 video=DP-1:1920x1080@60 mitigations=off idle=halt preempt=full
+root=LABEL=__DISTRO__ rw rootwait console=ttyTitania0 console=tty0 video=DP-1:1920x1080@60 mitigations=off idle=halt preempt=full
diff --git a/distros/ubuntu2404/image.yaml b/distros/ubuntu2404/image.yaml
index 5341373..d08aaeb 100644
--- a/distros/ubuntu2404/image.yaml
+++ b/distros/ubuntu2404/image.yaml
@@ -47,6 +47,14 @@ packages:
     - fonts-dejavu
     - fontconfig
     - systemd-zram-generator
+    - git
+    - flex
+    - gawk
+    - bison
+    - dwarves
+    - libelf-dev
+    - libssl-dev
+    - libncurses-dev
     action: install
 
 files:
diff --git a/distros/ubuntu2604/image.yaml b/distros/ubuntu2604/image.yaml
index 14cc806..f1674f9 100644
--- a/distros/ubuntu2604/image.yaml
+++ b/distros/ubuntu2604/image.yaml
@@ -47,6 +47,14 @@ packages:
     - fonts-dejavu
     - fontconfig
     - systemd-zram-generator
+    - git
+    - flex
+    - gawk
+    - bison
+    - dwarves
+    - libelf-dev
+    - libssl-dev
+    - libncurses-dev
     action: install
 
 files:
diff --git a/docker/image-builder/entrypoint.sh b/docker/image-builder/entrypoint.sh
index a358300..5b3c0df 100755
--- a/docker/image-builder/entrypoint.sh
+++ b/docker/image-builder/entrypoint.sh
@@ -19,8 +19,13 @@ else
     mkdir -p "$STAGING/debs"
     cp /repo/distros/shared/zz-update-boot      "$STAGING/"
     # Generate per-distro fstab with partition labels
-    printf 'LABEL=%-14s /          ext4  rw,relatime  0 1\nLABEL=%-14s /boot/efi  vfat  rw,relatime  0 2\n' \
-        "$ROOT_LABEL" "$EFI_LABEL" > "$STAGING/fstab"
+    cat <<EOF > "$STAGING/fstab"
+# /etc/fstab: static file system information.
+#
+# <file system> <mount point>   <type>  <options>       <dump>  <pass>
+LABEL=$ROOT_LABEL / ext4 defaults 0 1
+LABEL=$EFI_LABEL /boot/efi vfat defaults 0 1
+EOF
     cp /repo/distros/${DISTRO}/grow-rootfs       "$STAGING/"
     cp /repo/distros/${DISTRO}/nm-dns.conf       "$STAGING/" 2>/dev/null || true