diff --git a/elements/fedora/post-install.d/05-fstab-rootfs-label b/elements/fedora/post-install.d/05-fstab-rootfs-label
new file mode 100755
index 00000000..4825aad7
--- /dev/null
+++ b/elements/fedora/post-install.d/05-fstab-rootfs-label
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Fedora sets up for root to have a label of "_/"
+sed -i "s%LABEL=_/%LABEL=cloudimg-rootfs%" /etc/fstab
diff --git a/elements/vm/finalise.d/51-grub b/elements/vm/finalise.d/51-grub
index b6bfbbba..4880f4d1 100755
--- a/elements/vm/finalise.d/51-grub
+++ b/elements/vm/finalise.d/51-grub
@@ -53,8 +53,6 @@ fi
 sed -i "s%$PART_DEV%LABEL=cloudimg-rootfs%" $GRUB_CFG
 sed -i "s%search --no-floppy --fs-uuid --set=root .*$%search --no-floppy --set=root --label cloudimg-rootfs%" $GRUB_CFG
 sed -i "s%root=UUID=[A-Za-z0-9\-]*%root=LABEL=cloudimg-rootfs%" $GRUB_CFG
-# Fedora sets up for root to have a label of "_/"
-sed -i "s%LABEL=_/%LABEL=cloudimg-rootfs%" /etc/fstab
 if [ $DIST = 'Fedora' ] ; then
   # enable serial console
   sed -i "s%LABEL=cloudimg-rootfs%LABEL=cloudimg-rootfs console=tty0 console=ttyS0,115200%" $GRUB_CFG