diff --git a/elements/base/pre-install.d/02-baseline-tools b/elements/base/pre-install.d/02-baseline-tools
index 401d6042..9119e7a8 100755
--- a/elements/base/pre-install.d/02-baseline-tools
+++ b/elements/base/pre-install.d/02-baseline-tools
@@ -3,7 +3,8 @@
 
 set -e
 
-DISTRO=`lsb_release -si`
+# If lsb_release is missing, just do nothing.
+DISTRO=`lsb_release -si` || true
 
 case $DISTRO in
   'Ubuntu'|'Debian')
diff --git a/elements/fedora/element-deps b/elements/fedora/element-deps
new file mode 100644
index 00000000..64b9ac34
--- /dev/null
+++ b/elements/fedora/element-deps
@@ -0,0 +1 @@
+dib-run-parts
diff --git a/elements/fedora/pre-install.d/15-fedora-fixup-grub-cfg b/elements/fedora/pre-install.d/15-fedora-fixup-grub-cfg
new file mode 100755
index 00000000..c832d23e
--- /dev/null
+++ b/elements/fedora/pre-install.d/15-fedora-fixup-grub-cfg
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+GRUB_CFG=/boot/grub2/grub.cfg
+
+[ -f "$GRUB_CFG" ]
+
+# Update the config to have the search UUID of the image being built.
+# When partition staging is moved to a separate stage, this will need to happen
+# there. This generates a non-UUID config, which is irrelevant for booting with
+# hypervisor kernel + ramdisk, and fixed up by 51-grub for vm images.
+GRUB_DISABLE_LINUX_UUID=true grub2-mkconfig -o $GRUB_CFG