diff --git a/buildroot-external/board/rpi3/post-image.sh b/buildroot-external/board/rpi3/post-image.sh
index 36aee53a8..88834673a 100755
--- a/buildroot-external/board/rpi3/post-image.sh
+++ b/buildroot-external/board/rpi3/post-image.sh
@@ -10,20 +10,21 @@ BOOT_DATA=${BINARIES_DIR}/boot
 . ${BOARD_DIR}/info
 
 # Filename
-IMAGE_FILE=${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.vmdk
+IMAGE_FILE=${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.img
 
 # Init boot data
 rm -rf ${BOOT_DATA}
-mkdir -p ${BOOT_DATA}/EFI/BOOT
-mkdir -p ${BOOT_DATA}/EFI/barebox
 
-cp ${BINARIES_DIR}/barebox.bin ${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI
-cp ${BOARD_DIR}/barebox-state.dtb ${BOOT_DATA}/EFI/barebox/state.dtb
+cp ${BINARIES_DIR}/barebox.bin ${BOOT_DATA}/
+cp -t ${BOOT_DATA} bcm2710-rpi-3-b.dtb bcm2710-rpi-3-b-plus.dtb bcm2710-rpi-cm3.dtb 
+cp -t ${BOOT_DATA} rpi-firmware/bootcode.bin rpi-firmware/config.txt rpi-firmware/fixup.dat rpi-firmware/start.elf
+cp -r rpi-firmware/overlays ${BOOT_DATA}/
+
+# Update Boot options
+
 
 # Create other layers
 create_boot_image ${BINARIES_DIR}
 create_overlay_image ${BINARIES_DIR}
 
-create_hdd_image ${BINARIES_DIR} ${BINARIES_DIR}/harddisk.img 6
-
-qemu-img convert -O vmdk ${BINARIES_DIR}/harddisk.img ${BINARIES_DIR}/${IMAGE_FILE}
+create_hdd_image ${BINARIES_DIR} ${BINARIES_DIR}/${IMAGE_FILE} 6
diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh
index 4bb672e8a..47243cfb5 100644
--- a/buildroot-external/scripts/rootfs-layer.sh
+++ b/buildroot-external/scripts/rootfs-layer.sh
@@ -17,6 +17,9 @@ function fix_rootfs() {
     rm -rf ${TARGET_DIR}/srv
     rm -rf ${TARGET_DIR}/opt
 
+    # Cleanup miscs
+    rm -rf ${TARGET_DIR}/usr/lib/modules-load.d
+
     # Fix: tempfs with /srv
     sed -i "/srv/d" ${TARGET_DIR}/usr/lib/tmpfiles.d/home.conf
 
diff --git a/buildroot-patches/.ignore b/buildroot-patches/.ignore
deleted file mode 100644
index 8b1378917..000000000
--- a/buildroot-patches/.ignore
+++ /dev/null
@@ -1 +0,0 @@
-