diff --git a/buildroot-external/board/raspberrypi/hassos-hook.sh b/buildroot-external/board/raspberrypi/hassos-hook.sh
index d9fa7ea9d..f9ca9df73 100755
--- a/buildroot-external/board/raspberrypi/hassos-hook.sh
+++ b/buildroot-external/board/raspberrypi/hassos-hook.sh
@@ -7,11 +7,9 @@ function hassos_pre_image() {
     cp -t "${BOOT_DATA}" \
         "${BINARIES_DIR}/u-boot.bin" \
         "${BINARIES_DIR}/boot.scr"
-    cp -t "${BOOT_DATA}" \
-        "${BINARIES_DIR}"/*.dtb \
-        "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
+    cp "${BINARIES_DIR}"/*.dtb "${BOOT_DATA}/"
     cp -r "${BINARIES_DIR}/rpi-firmware/overlays" "${BOOT_DATA}/"
-    cp -f "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
+    cp "${BOARD_DIR}/../boot-env.txt" "${BOOT_DATA}/config.txt"
 
     # Firmware
     if [[ "${BOARD_ID}" =~ "rpi4" ]]; then
@@ -21,7 +19,8 @@ function hassos_pre_image() {
     else
         cp -t "${BOOT_DATA}" \
         "${BINARIES_DIR}/rpi-firmware/fixup.dat" \
-        "${BINARIES_DIR}/rpi-firmware/start.elf"
+        "${BINARIES_DIR}/rpi-firmware/start.elf" \
+        "${BINARIES_DIR}/rpi-firmware/bootcode.bin"
     fi
 
     # Set cmd options
diff --git a/buildroot-external/board/raspberrypi/kernel.config b/buildroot-external/board/raspberrypi/kernel.config
index 2a186347d..15ed16aa7 100644
--- a/buildroot-external/board/raspberrypi/kernel.config
+++ b/buildroot-external/board/raspberrypi/kernel.config
@@ -1 +1,2 @@
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_FB_BCM2708 is not set
diff --git a/buildroot-external/board/raspberrypi/uboot.config b/buildroot-external/board/raspberrypi/uboot.config
index d30bac855..f358c84db 100644
--- a/buildroot-external/board/raspberrypi/uboot.config
+++ b/buildroot-external/board/raspberrypi/uboot.config
@@ -7,3 +7,4 @@ CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_OHCI_HCD=y
+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
\ No newline at end of file
diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh
index 931167db6..aebd4a70c 100755
--- a/buildroot-external/scripts/hdd-image.sh
+++ b/buildroot-external/scripts/hdd-image.sh
@@ -91,7 +91,7 @@ function create_kernel_image() {
     # Mount / init file structs
     sudo mkdir -p /mnt/data/
     sudo mount -o loop "${kernel_img}" /mnt/data
-    sudo cp -f "${kernel}" /mnt/data/
+    sudo cp "${kernel}" /mnt/data/
     sudo umount /mnt/data
 }
 
diff --git a/scripts/entry.sh b/scripts/entry.sh
index ef9cbe2c1..b6c82b3ac 100755
--- a/scripts/entry.sh
+++ b/scripts/entry.sh
@@ -7,7 +7,7 @@ USER="root"
 dockerd -s vfs &> /dev/null &
 
 # Setup local user
-if [ "${BUILDER_UID:0}" -ne 0 ] && [ "${BUILDER_GID:0}" -ne 0 ]; then
+if [ "${BUILDER_UID:-0}" -ne 0 ] && [ "${BUILDER_GID:-0}" -ne 0 ]; then
   groupadd -g "${BUILDER_GID}" builder
   useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker,sudo builder
   echo "builder ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers