diff --git a/components/liveinstall.xml b/components/liveinstall.xml
index ad15aa7..f91283c 100644
--- a/components/liveinstall.xml
+++ b/components/liveinstall.xml
@@ -46,6 +46,8 @@
 		</type>
 	</preferences>
 	<packages type="iso" patternType="plusRecommended" profiles="LiveInstall">
+		<!-- Filter out unwanted EFI files from the embedded ESP, see rhbz#2358785 -->
+		<file name="iso-esp-excludes.yaml" target="image/exclude_files_efifatimage.yaml"/>
 		<!-- The point of a live image is to install -->
 		<namedCollection name="anaconda-tools"/>
 		<package name="anaconda"/>
diff --git a/iso-esp-excludes.yaml b/iso-esp-excludes.yaml
new file mode 100644
index 0000000..c49d940
--- /dev/null
+++ b/iso-esp-excludes.yaml
@@ -0,0 +1,3 @@
+exclude:
+- BOOT/fb*.efi
+- fedora