diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh
index 2057eda..c74f806 100644
--- a/lib/util-iso-boot.sh
+++ b/lib/util-iso-boot.sh
@@ -39,8 +39,8 @@ prepare_initramfs(){
 prepare_boot_extras(){
     cp $1/boot/amd-ucode.img $2/amd_ucode.img
     cp $1/boot/intel-ucode.img $2/intel_ucode.img
-    cp $1/usr/share/licenses/amd-ucode/LICENSE $2/amd_ucode.LICENSE
-    cp $1/usr/share/licenses/intel-ucode/LICENSE $2/intel_ucode.LICENSE
+    cp $1/usr/share/licenses/amd-ucode/LIC* $2/amd_ucode.LICENSE
+    cp $1/usr/share/licenses/intel-ucode/LIC* $2/intel_ucode.LICENSE
     cp $1/boot/memtest86+/memtest.bin $2/memtest
     cp $1/usr/share/licenses/common/GPL2/license.txt $2/memtest.COPYING
 }
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index d87e69a..3931e55 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -198,6 +198,10 @@ make_iso() {
     touch "${iso_root}/.miso"
     for sfs_dir in $(find "${work_dir}" -maxdepth 1 -type d); do
         if [[ "${sfs_dir}" != "${work_dir}" ]]; then
+            if [[ -e "${sfs_dir}"/etc/pacman.d/gnupg ]]; then
+                msg2 "Removing '/etc/pacman.d/gnupg' folder from ${sfs_dir}"
+                rm -rf "${sfs_dir}"/etc/pacman.d/gnupg
+            fi
             make_sfs "${sfs_dir}"
         fi
     done
@@ -406,8 +410,6 @@ make_image_live() {
 
         umount_fs
 
-        # Clean up GnuPG keys
-        rm -rf "${path}/etc/pacman.d/gnupg"
         clean_up_image "${path}"
         : > ${work_dir}/build.${FUNCNAME}
         msg "Done [Live installation] (livefs)"