diff --git a/buildroot-external/board/rpi3/post-image.sh b/buildroot-external/board/rpi3/post-image.sh
index 0fedbe645..e7050e24a 100755
--- a/buildroot-external/board/rpi3/post-image.sh
+++ b/buildroot-external/board/rpi3/post-image.sh
@@ -10,7 +10,7 @@ BOOT_DATA=${BINARIES_DIR}/boot
 . ${BOARD_DIR}/info
 
 # Filename
-IMAGE_FILE=${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.img
+IMAGE_FILE=${BINARIES_DIR}/${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.img
 
 # Init boot data
 rm -rf ${BOOT_DATA}
@@ -22,19 +22,28 @@ cp -t ${BOOT_DATA} \
     ${BINARIES_DIR}/bcm2710-rpi-3-b-plus.dtb \
     ${BINARIES_DIR}/bcm2710-rpi-cm3.dtb \
     ${BINARIES_DIR}/rpi-firmware/bootcode.bin \
-    ${BINARIES_DIR}/rpi-firmware/config.txt \
     ${BINARIES_DIR}/rpi-firmware/fixup.dat \
     ${BINARIES_DIR}/rpi-firmware/start.elf
 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"
+    echo "dtparam=audio=on"
+) > ${BOOT_DATA}/config.txt
 
 
 # Create other layers
 create_boot_image ${BINARIES_DIR}
 create_overlay_image ${BINARIES_DIR}
 
-create_disk_image ${BINARIES_DIR} ${BINARIES_DIR}/${IMAGE_FILE} 6
-fix_disk_image_mbr ${BINARIES_DIR}/${IMAGE_FILE}
+create_disk_image ${BINARIES_DIR} ${IMAGE_FILE} 6
+fix_disk_image_mbr ${IMAGE_FILE}
 
-bzip2 ${BINARIES_DIR}/${IMAGE_FILE}
+rm -rf ${IMAGE_FILE}.bz2
+bzip2 ${IMAGE_FILE}
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index 90b220c3e..4201029e1 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -73,7 +73,8 @@ function create_disk_image() {
 
 
 function fix_disk_image_mbr() {
-    local hdd_img=${2}
+    local hdd_img=${1}
 
-    #sgdisk -h 1 ${hdd_img}
+    sgdisk -t 1:"E3C9E316-0B5C-4DB8-817D-F92DF00215AE" ${hdd_img}
+    dd if=${BR2_EXTERNAL_HASSOS_PATH}/scripts/mbr.img of=${hdd_img} conv=notrunc bs=512 count=1
 }
diff --git a/buildroot-external/scripts/mbr.img b/buildroot-external/scripts/mbr.img
new file mode 100644
index 000000000..19f4903d0
Binary files /dev/null and b/buildroot-external/scripts/mbr.img differ