diff --git a/fstab b/fstab
index 9d8699b..dc417c7 100644
--- a/fstab
+++ b/fstab
@@ -1,5 +1,5 @@
 # The root file system has fs_passno=1 as per fstab(5) for automatic fsck.
-LABEL=raspiroot / 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.
-LABEL=raspiboot /boot/firmware vfat rw 0 2
+LABEL=RASPIFIRM /boot/firmware vfat rw 0 2
 proc /proc proc defaults 0 0
diff --git a/raspi3.yaml b/raspi3.yaml
index 579234e..3db9ff3 100644
--- a/raspi3.yaml
+++ b/raspi3.yaml
@@ -22,11 +22,11 @@ steps:
 
   - mkfs: vfat
     partition: boot-part
-    label: raspiboot
+    label: RASPIFIRM
 
   - mkfs: ext4
     partition: root-part
-    label: raspiroot
+    label: RASPIROOT
 
   - mount: root-part
     fs-tag: root-fs
@@ -121,7 +121,7 @@ steps:
   # the partition labeled raspiroot instead of forcing it to mmcblk0p2
   - chroot: root-fs
     shell: |
-      sed -i 's/.dev.mmcblk0p2/LABEL=raspiroot/' /boot/firmware/cmdline.txt
+      sed -i 's/.dev.mmcblk0p2/LABEL=RASPIROOT/' /boot/firmware/cmdline.txt
 
   # TODO(https://github.com/larswirzenius/vmdb2/issues/24): remove once vmdb
   # clears /etc/resolv.conf on its own.