diff --git a/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg b/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg
index 95b3031b..135a8c94 100644
--- a/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg
+++ b/buildroot-external/board/raspberrypi/genimage-raspberrypi3-64.cfg
@@ -9,11 +9,11 @@ image boot.vfat {
       "rpi-firmware/config.txt",
       "rpi-firmware/fixup.dat",
       "rpi-firmware/start.elf",
-      "rpi-firmware/fixupcd.dat",
-      "rpi-firmware/startcd.elf",
-      "rpi-firmware/fixupx.dat",
-      "rpi-firmware/startx.elf",
-      "overlays",
+      "rpi-firmware/fixup_cd.dat",
+      "rpi-firmware/start_cd.elf",
+      "rpi-firmware/fixup_x.dat",
+      "rpi-firmware/start_x.elf",
+      "rpi-firmware/overlays",
       "Image"
     }
   }
diff --git a/buildroot-external/configs/rpi3_64-gui_defconfig b/buildroot-external/configs/rpi3_64-gui_defconfig
index e3982250..aea5bd91 100644
--- a/buildroot-external/configs/rpi3_64-gui_defconfig
+++ b/buildroot-external/configs/rpi3_64-gui_defconfig
@@ -370,9 +370,6 @@ BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_X=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI_CD=y
 BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="$(BR2_EXTERNAL)/board/raspberrypi/config_3_64bit.txt"
-BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI=y
-BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT=y
-BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_UX500_FIRMWARE=y
 BR2_PACKAGE_WILC1000_FIRMWARE=y
 BR2_PACKAGE_WILINK_BT_FIRMWARE=y
@@ -649,7 +646,6 @@ BR2_PACKAGE_SNAPCAST_SERVER=y
 BR2_PACKAGE_SPOTIFYD=y
 BR2_PACKAGE_USERLAND_TOOLS=y
 BR2_PACKAGE_VOCALFUSION=y
-BR2_PACKAGE_WIFI_CONNECT=y
 BR2_PACKAGE_WIRINGPI2=y
 BR2_PACKAGE_PYTHON_ADAPT_PARSER=y
 BR2_PACKAGE_PYTHON_ASTRAL=y