diff --git a/fstab b/fstab
index 5dd5a98..9d8699b 100644
--- a/fstab
+++ b/fstab
@@ -1,5 +1,5 @@
 # The root file system has fs_passno=1 as per fstab(5) for automatic fsck.
-/dev/mmcblk0p2 / ext4 rw 0 1
+LABEL=raspiroot / ext4 rw 0 1
 # All other file systems have fs_passno=2 as per fstab(5) for automatic fsck.
-/dev/mmcblk0p1 /boot/firmware vfat rw 0 2
+LABEL=raspiboot /boot/firmware vfat rw 0 2
 proc /proc proc defaults 0 0
diff --git a/raspi3.yaml b/raspi3.yaml
index 29837de..4dbebdc 100644
--- a/raspi3.yaml
+++ b/raspi3.yaml
@@ -22,9 +22,11 @@ steps:
 
   - mkfs: vfat
     partition: boot-part
+    label: raspiboot
 
   - mkfs: ext4
     partition: root-part
+    label: raspiroot
 
   - mount: root-part
     fs-tag: root-fs