diff --git a/config.sh b/config.sh
index 4bb1825..d30f546 100644
--- a/config.sh
+++ b/config.sh
@@ -713,6 +713,9 @@ EOF
 function raspberrypi_sbc_steps() {
   cd /lib/firmware/brcm
   xz -d -k brcmfmac43430-sdio.raspberrypi,3-model-b.txt.xz
+  cat > /boot/cmdline.txt << EOF
+console=ttyAMA0,115200 console=tty1 root=LABEL=RPIROOT rootfstype=ext4 elevator=deadline rootwait
+EOF
 }
 
 #
diff --git a/sbc/pi.xml b/sbc/pi.xml
index e703ef6..2ebf2fb 100644
--- a/sbc/pi.xml
+++ b/sbc/pi.xml
@@ -15,8 +15,8 @@
     <type image="oem" format="raw"
       filesystem="ext4"
       bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="efi"
-      kernelcmdline="console=ttyAMA0,115200 console=tty1 root= rootfstype=ext4 elevator=deadline rootwait"
-      devicepersistency="by-uuid"
+      kernelcmdline="console=ttyAMA0,115200 console=tty1 root=LABEL=RPIROOT rootfstype=ext4 elevator=deadline rootwait"
+      devicepersistency="by-label"
       editbootinstall="editbootinstall_rpi.sh"
       rootfs_label="RPIROOT">
       <oemconfig>