diff --git a/buildroot-external/board/ova/barebox-env/boot/system0 b/buildroot-external/board/ova/barebox-env/boot/system0
new file mode 100644
index 000000000..0baf1a583
--- /dev/null
+++ b/buildroot-external/board/ova/barebox-env/boot/system0
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+global.bootm.image="/mnt/disk0.3/boot/bzImage"
+global.linux.bootargs.dyn.root="root=/dev/sda3 rootfstype=squashfs ro"
+
diff --git a/buildroot-external/board/ova/barebox-env/boot/system1 b/buildroot-external/board/ova/barebox-env/boot/system1
index a5389f842..7712550a8 100644
--- a/buildroot-external/board/ova/barebox-env/boot/system1
+++ b/buildroot-external/board/ova/barebox-env/boot/system1
@@ -1,3 +1,4 @@
+#!/bin/sh
 
-global bootm.image="/dev/disk0.2/boot/bzImage"
-global linux.bootargs.base="root=/dev/sda3 rootfstype=squashfs ro"
+global.bootm.image="/mnt/disk0.4/boot/bzImage"
+global.linux.bootargs.dyn.root="root=/dev/sda4 rootfstype=squashfs ro"
diff --git a/buildroot-external/board/ova/barebox.config b/buildroot-external/board/ova/barebox.config
index f11b5acd4..6d1b94e1b 100644
--- a/buildroot-external/board/ova/barebox.config
+++ b/buildroot-external/board/ova/barebox.config
@@ -1,14 +1,20 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_MMU=y
-CONFIG_PROMPT="hassio-os:"
 CONFIG_MALLOC_SIZE=0x0
 CONFIG_MALLOC_TLSF=y
+CONFIG_PROMPT="hassio-os:"
+CONFIG_CMDLINE_EDITING=y
+CONFIG_AUTO_COMPLETE=y
 CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_OFTREE=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
+CONFIG_DEFAULT_ENVIRONMENT_PATH="/build/buildroot-external/board/ova/barebox-env"
 CONFIG_STATE=y
 CONFIG_BOOTCHOOSER=y
 CONFIG_CMD_UIMAGE=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_MAGICVAR=y
+CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_DETECT=y
 CONFIG_CMD_STATE=y
 CONFIG_CMD_BOOTCHOOSER=y
diff --git a/buildroot-external/board/ova/rauc.conf b/buildroot-external/board/ova/rauc.conf
index e7f55d136..0c31528c0 100644
--- a/buildroot-external/board/ova/rauc.conf
+++ b/buildroot-external/board/ova/rauc.conf
@@ -11,11 +11,11 @@ type=vfs
 bootname=boot
 
 [slot.rootfs.0]
-device=/dev/sda1
+device=/dev/sda2
 type=raw
 bootname=system0
 
 [slot.rootfs.1]
-device=/dev/sda2
+device=/dev/sda3
 type=raw
 bootname=system1
diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig
index 8ceee447b..9341e8a92 100644
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -1,6 +1,7 @@
 BR2_x86_64=y
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/ccache"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_HASSIO_PATH)/patches"
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y