diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks
index 68f2673..3534acf 100644
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@@ -55,10 +55,10 @@ glibc-all-langpacks
 
 %post
 
+# Find the architecture we are on
+arch=$(uname -m)
 # Setup Raspberry Pi firmware
 if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
 fi
 
diff --git a/fedora-iot.ks b/fedora-iot.ks
index 7b94a1f..cd77668 100644
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@@ -24,10 +24,11 @@ ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipk
 reboot
 
 %post --erroronfail
+
+# Find the architecture we are on
+arch=$(uname -m)
 # Setup Raspberry Pi firmware
 if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
 fi
 
diff --git a/fedora-modular-disk-minimal.ks b/fedora-modular-disk-minimal.ks
index e3269b6..a6120e4 100644
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@@ -56,18 +56,9 @@ sssd-client
 
 # Find the architecture we are on
 arch=$(uname -m)
-
 # Setup Raspberry Pi firmware
-if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
-cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
-else
-cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
-cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
-cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
-fi
 fi
 
 releasever=$(rpm --eval '%{fedora}')