diff --git a/buildroot-external/board/pc/barebox.config b/buildroot-external/board/pc/barebox.config
index f97b7b4af..115f5b805 100644
--- a/buildroot-external/board/pc/barebox.config
+++ b/buildroot-external/board/pc/barebox.config
@@ -6,6 +6,5 @@ CONFIG_DRIVER_SERIAL_EFI_STDIO=y
 # CONFIG_SPI is not set
 CONFIG_DISK=y
 CONFIG_DISK_WRITE=y
-CONFIG_CLOCKSOURCE_EFI=y
 CONFIG_FS_EFI=y
 CONFIG_FS_EFIVARFS=y
diff --git a/buildroot-external/bootloader/barebox.config b/buildroot-external/bootloader/barebox.config
index 4d671edcb..96bc5a9c5 100644
--- a/buildroot-external/bootloader/barebox.config
+++ b/buildroot-external/bootloader/barebox.config
@@ -19,7 +19,10 @@ CONFIG_PARTITION_DISK_EFI=y
 CONFIG_STATE=y
 CONFIG_STATE_DRV=y
 CONFIG_BOOTCHOOSER=y
+CONFIG_RESET_SOURCE=y
 CONFIG_CMD_BOOT=y
+CONFIG_CMD_RESET=y
+CONFIG_CMD_BOOTCHOOSER=y
 CONFIG_CMD_NV=y
 CONFIG_CMD_EXPORT=y
 CONFIG_CMD_GLOBAL=y
@@ -27,21 +30,21 @@ CONFIG_CMD_BASENAME=y
 CONFIG_CMD_DIRNAME=y
 CONFIG_CMD_READLINK=y
 CONFIG_CMD_GETOPT=y
+CONFIG_CMD_READF=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
 CONFIG_CMD_MENUTREE=y
 CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_STATE=y
-CONFIG_CMD_BOOTCHOOSER=y
-CONFIG_CMD_READF=y
 
 CONFIG_OFTREE=y
 CONFIG_OFTREE_OVERLAY=y
 
 CONFIG_DISK=y
 CONFIG_DISK_WRITE=y
-
+CONFIG_FS_EXT4=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
-CONFIG_FS_EXT4=y
 CONFIG_LZ4_DECOMPRESS=y
diff --git a/buildroot-external/configs/generic_x86_64_defconfig b/buildroot-external/configs/generic_x86_64_defconfig
index e7ad8758e..26dab6db0 100644
--- a/buildroot-external/configs/generic_x86_64_defconfig
+++ b/buildroot-external/configs/generic_x86_64_defconfig
@@ -94,7 +94,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
-BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2020.04.0"
+BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2021.05.0"
 BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y
 BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/barebox.config"
 BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config"
diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig
index d66a678fa..53623be6c 100644
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -96,7 +96,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_BAREBOX=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
-BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2020.04.0"
+BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2021.05.0"
 BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y
 BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/barebox.config"
 BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/barebox.config"