diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI.conf
similarity index 84%
rename from release/arm64/RPI3.conf
rename to release/arm64/RPI.conf
index c4a68c6257d9..2dfe23547ae9 100644
--- a/release/arm64/RPI3.conf
+++ b/release/arm64/RPI.conf
@@ -8,7 +8,7 @@ DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2711-rp
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDED_TARGET="arm64"
 EMBEDDEDBUILD=1
-EMBEDDEDPORTS="sysutils/u-boot-rpi3 sysutils/rpi-firmware"
+EMBEDDEDPORTS="sysutils/u-boot-rpi-arm64 sysutils/rpi-firmware"
 FAT_SIZE="50m -b 1m"
 FAT_TYPE="16"
 IMAGE_SIZE="3072M"
@@ -18,10 +18,10 @@ NODOC=1
 OL_DIR="${DTB_DIR}/overlays"
 OVERLAYS="mmc.dtbo pwm.dtbo disable-bt.dtbo"
 PART_SCHEME="MBR"
-export BOARDNAME="RPI3"
+export BOARDNAME="RPI"
 
 arm_install_uboot() {
-	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3"
+	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi-arm64"
 	UBOOT_FILES="README u-boot.bin"
 	DTB_FILES="armstub8.bin armstub8-gic.bin bootcode.bin fixup_cd.dat \
 		fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \
@@ -39,9 +39,7 @@ arm_install_uboot() {
 		chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \
 			${FATMOUNT}/${_DF}
 	done
-	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi4.txt \
-			${FATMOUNT}
-	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi3.txt \
+	chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_arm64.txt \
 			${FATMOUNT}/config.txt
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays
 	for _OL in ${OVERLAYS}; do