diff --git a/buildroot-external/barebox-env/bin/init b/buildroot-external/barebox-env/bin/init
index 2ec2a484d..29678ded5 100644
--- a/buildroot-external/barebox-env/bin/init
+++ b/buildroot-external/barebox-env/bin/init
@@ -5,9 +5,6 @@ export PATH=/env/bin
 global linux.bootargs.base
 global linux.bootargs.dyn.root
 
-# Init board specific stuff
-[ -e /env/config-board ] && /env/config-board
-
 # Autostart
 for i in /env/init/*; do
 	. $i
diff --git a/buildroot-external/barebox-env/boot/system0 b/buildroot-external/barebox-env/boot/system0
index f1b789561..7f2564386 100644
--- a/buildroot-external/barebox-env/boot/system0
+++ b/buildroot-external/barebox-env/boot/system0
@@ -1,5 +1,12 @@
 #!/bin/sh
 
-global bootm.image="/mnt/disk0.1/boot/bzImage"
 global linux.bootargs.dyn.root="root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
 
+mkdir -p /mnt/system
+mount -t squashfs /dev/disk0.hassos-system0 /mnt/system
+
+if [ -f "/mnt/system/boot/bzImage" ]; then
+    global bootm.image="/mnt/system/boot/bzImage"
+else
+    global bootm.image="/mnt/system/boot/zImage"
+fi
diff --git a/buildroot-external/barebox-env/boot/system1 b/buildroot-external/barebox-env/boot/system1
index c7fdcead3..5d6fd6650 100644
--- a/buildroot-external/barebox-env/boot/system1
+++ b/buildroot-external/barebox-env/boot/system1
@@ -1,4 +1,13 @@
 #!/bin/sh
 
-global bootm.image="/mnt/disk0.2/boot/bzImage"
 global linux.bootargs.dyn.root="root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"
+
+mkdir -p /mnt/system
+mount -t squashfs /dev/disk0.hassos-system1 /mnt/system
+
+if [ -f "/mnt/system/boot/bzImage" ]; then
+    global bootm.image="/mnt/system/boot/bzImage"
+else
+    global bootm.image="/mnt/system/boot/zImage"
+fi
+
diff --git a/buildroot-external/board/ova/barebox.config b/buildroot-external/board/ova/barebox.config
index 24a3e34fb..24c2dd403 100644
--- a/buildroot-external/board/ova/barebox.config
+++ b/buildroot-external/board/ova/barebox.config
@@ -18,8 +18,6 @@ CONFIG_STATE=y
 CONFIG_BOOTCHOOSER=y
 # CONFIG_CMD_VERSION is not set
 CONFIG_CMD_BOOT=y
-CONFIG_CMD_UIMAGE=y
-CONFIG_CMD_AUTOMOUNT=y
 CONFIG_CMD_NV=y
 CONFIG_CMD_EXPORT=y
 CONFIG_CMD_GLOBAL=y
diff --git a/buildroot-external/board/rpi2/barebox-env/init/fix-devicetree b/buildroot-external/board/rpi2/barebox-env/init/fix-devicetree
new file mode 100644
index 000000000..7173a84c3
--- /dev/null
+++ b/buildroot-external/board/rpi2/barebox-env/init/fix-devicetree
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+of_fixup_status /soc/mmc@7e202000/
diff --git a/buildroot-external/board/rpi2/barebox.config b/buildroot-external/board/rpi2/barebox.config
index 370c51e99..7e21c077e 100644
--- a/buildroot-external/board/rpi2/barebox.config
+++ b/buildroot-external/board/rpi2/barebox.config
@@ -20,14 +20,13 @@ CONFIG_FLEXIBLE_BOOTARGS=y
 CONFIG_PARTITION_DISK_EFI=y
 # CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE is not set
 # CONFIG_PARTITION_DISK_EFI_GPT_COMPARE is not set
-CONFIG_DEFAULT_ENVIRONMENT_PATH="/build/buildroot-external/barebox-env"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="/build/buildroot-external/barebox-env /build/buildroot-external/board/rpi2/barebox-env"
 CONFIG_STATE=y
 CONFIG_BOOTCHOOSER=y
 CONFIG_DEBUG_LL=y
 # CONFIG_CMD_VERSION is not set
 CONFIG_CMD_BOOT=y
-CONFIG_CMD_UIMAGE=y
-CONFIG_CMD_AUTOMOUNT=y
+# CONFIG_CMD_BOOTU is not set
 CONFIG_CMD_NV=y
 CONFIG_CMD_EXPORT=y
 CONFIG_CMD_GLOBAL=y
@@ -38,13 +37,12 @@ CONFIG_CMD_GETOPT=y
 CONFIG_CMD_MENUTREE=y
 CONFIG_CMD_TIMEOUT=y
 CONFIG_CMD_DETECT=y
-CONFIG_CMD_OF_DUMP=y
+CONFIG_CMD_OF_FIXUP_STATUS=y
 CONFIG_CMD_STATE=y
 CONFIG_CMD_BOOTCHOOSER=y
 CONFIG_SERIAL_AMBA_PL011=y
 # CONFIG_SPI is not set
 CONFIG_MCI=y
-CONFIG_MCI_STARTUP=y
 CONFIG_MCI_BCM283X=y
 CONFIG_STATE_DRV=y
 CONFIG_GPIO_BCM283X=y
diff --git a/buildroot-external/board/rpi2/post-image.sh b/buildroot-external/board/rpi2/post-image.sh
index 687376b47..fb5bb92fb 100755
--- a/buildroot-external/board/rpi2/post-image.sh
+++ b/buildroot-external/board/rpi2/post-image.sh
@@ -27,8 +27,6 @@ cp -r ${BINARIES_DIR}/rpi-firmware/overlays ${BOOT_DATA}/
 # Update Boot options
 (
     echo "kernel=barebox.bin"
-    echo "cmdline=\"\""
-    echo "gpu_mem=16"
     echo "disable_splash=1"
     echo "dtparam=i2c_arm=on"
     echo "dtparam=spi=on"
diff --git a/buildroot-external/board/rpi3/barebox.config b/buildroot-external/board/rpi3/barebox.config
index df0e27130..c5aa0424b 100644
--- a/buildroot-external/board/rpi3/barebox.config
+++ b/buildroot-external/board/rpi3/barebox.config
@@ -25,7 +25,6 @@ CONFIG_STATE=y
 CONFIG_BOOTCHOOSER=y
 # CONFIG_CMD_VERSION is not set
 CONFIG_CMD_BOOT=y
-CONFIG_CMD_UIMAGE=y
 CONFIG_CMD_AUTOMOUNT=y
 CONFIG_CMD_NV=y
 CONFIG_CMD_EXPORT=y
diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig
index 1d8ab8380..f426e4582 100644
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -69,7 +69,7 @@ BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
 BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2018.05.0"
 BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG=y
 BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/rpi2/barebox.config"
-BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/barebox-env"
+BR2_TARGET_BAREBOX_CUSTOM_EMBEDDED_ENV_PATH="$(BR2_EXTERNAL_HASSOS_PATH)/barebox-env $(BR2_EXTERNAL_HASSOS_PATH)/board/rpi2/barebox-env"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
diff --git a/buildroot-external/kernel.config b/buildroot-external/kernel.config
index 1daab52e7..3bb3cebc0 100644
--- a/buildroot-external/kernel.config
+++ b/buildroot-external/kernel.config
@@ -1,4 +1,5 @@
 CONFIG_KERNEL_LZ4=y
+CONFIG_CMDLINE=""
 
 CONFIG_ZRAM=y
 CONFIG_ZSMALLOC=y