diff --git a/buildroot-external/board/ova/barebox.config b/buildroot-external/board/ova/barebox.config
index 7a9d88d2b..f8359d7c8 100644
--- a/buildroot-external/board/ova/barebox.config
+++ b/buildroot-external/board/ova/barebox.config
@@ -1,27 +1,31 @@
 # CONFIG_LOCALVERSION_AUTO is not set
-CONF_MMU
+CONFIG_MMU=y
 CONFIG_PROMPT="hassio-os:"
-CONFIG_BLOCK=y
-CONFIG_PARTITION=y
-CONFIG_PARTITION_DISK=y
-CONFIG_PARTITION_DISK_EFI=y
-CONFIG_DEFAULT_COMPRESSION_LZ4=y
-CONFIG_AUTO_COMPLETE=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_OFTREE=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_STATE=y
 CONFIG_BOOTCHOOSER=y
 CONFIG_CMD_UIMAGE=y
 CONFIG_CMD_STATE=y
 CONFIG_CMD_BOOTCHOOSER=y
+CONFIG_OFDEVICE=y
+CONFIG_OF_BAREBOX_DRIVERS=y
+CONFIG_DRIVER_SERIAL_EFI=y
+CONFIG_DRIVER_SERIAL_EFI_STDIO=y
+# CONFIG_SPI is not set
+CONFIG_DISK=y
+CONFIG_DISK_ATA=y
+CONFIG_USB_HOST=y
+CONFIG_VIDEO=y
+CONFIG_DRIVER_VIDEO_EFI_GOP=y
 CONFIG_CLOCKSOURCE_EFI=y
+# CONFIG_PINCTRL is not set
 CONFIG_FS_EXT4=y
-CONFIG_FS_FAT=y
-CONFIG_FS_SQUASHFS=y
-# CONFIG_FS_RAMFS is not set
 CONFIG_FS_EFI=y
 CONFIG_FS_EFIVARFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
 CONFIG_FS_FAT_LFN=y
+CONFIG_FS_SQUASHFS=y
 CONFIG_LZ4_DECOMPRESS=y
diff --git a/buildroot-external/board/ova/genimage.cfg b/buildroot-external/board/ova/genimage.cfg
index c737f78e7..63f45df51 100644
--- a/buildroot-external/board/ova/genimage.cfg
+++ b/buildroot-external/board/ova/genimage.cfg
@@ -1,5 +1,6 @@
 image boot.vfat {
   vfat {
+    extraargs = "-n boot -F32"
     files = {
       "bzImage"
     }
@@ -8,15 +9,16 @@ image boot.vfat {
       image = "barebox.bin"
     }
   }
-  size = 32M
+  size = 64M
 }
 
 image sdcard.img {
   hdimage {
+    align = 1M
   }
 
   partition boot {
-    partition-type = 0xC
+    partition-type = 0xef
     bootable = "true"
     image = "boot.vfat"
   }
diff --git a/buildroot-external/board/ova/kernel.config b/buildroot-external/board/ova/kernel.config
index a76eb35e9..7e80fb062 100644
--- a/buildroot-external/board/ova/kernel.config
+++ b/buildroot-external/board/ova/kernel.config
@@ -1,5 +1,6 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_KERNEL_LZ4=y
+CONFIG_EFI_STUB=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ=y
diff --git a/buildroot-external/board/ova/post-image.sh b/buildroot-external/board/ova/post-image.sh
index c87628c80..84e955028 100755
--- a/buildroot-external/board/ova/post-image.sh
+++ b/buildroot-external/board/ova/post-image.sh
@@ -13,8 +13,8 @@ rm -rf "$GENIMAGE_TMP" "$OVERLAY_IMG" "$DATA_IMG"
 dd if=/dev/zero of="$OVERLAY_IMG" bs=4k count=16000
 dd if=/dev/zero of="$DATA_IMG" bs=4k count=16000
 
-mkfs.ext4 "$OVERLAY_IMG" && tune2fs -c0 -i0 "$OVERLAY_IMG"
-mkfs.ext4 "$DATA_IMG" && tune2fs -c0 -i0 "$DATA_IMG"
+mkfs.ext4 "$OVERLAY_IMG" && tune2fs -L "overlay" -c0 -i0 "$OVERLAY_IMG"
+mkfs.ext4 "$DATA_IMG" && tune2fs -L "data" -c0 -i0 "$DATA_IMG"
 
 genimage \
     --rootpath "$TARGET_DIR" \
@@ -23,5 +23,6 @@ genimage \
     --outputpath "$BINARIES_DIR" \
     --config "$GENIMAGE_CFG"
 
+qemu-img resize -f raw "$BINARIES_DIR/sdcard.img" 1G
 qemu-img convert -O vmdk "$BINARIES_DIR/sdcard.img" "$BINARIES_DIR/hassio-os.vmdk"