diff --git a/buildroot-external/board/raspberrypi/post-image.sh b/buildroot-external/board/raspberrypi/post-image.sh
index 6eb2497ae..409481fdc 100755
--- a/buildroot-external/board/raspberrypi/post-image.sh
+++ b/buildroot-external/board/raspberrypi/post-image.sh
@@ -12,13 +12,6 @@ BOOT_DATA=${BINARIES_DIR}/boot
 # Filename
 IMAGE_FILE=${BINARIES_DIR}/${HASSOS_ID}_${BOARD_ID}-${VERSION_MAJOR}.${VERSION_BUILD}.img
 
-# Eval kernel name
-if [ "$BOARD_ID" == "rpi3-64" ]; then
-    KERNEL_NAME="Image"
-else
-    KERNEL_NAME="zImage"
-fi
-
 # Init boot data
 rm -rf ${BOOT_DATA}
 mkdir -p ${BOOT_DATA}
@@ -43,8 +36,11 @@ cp -r ${BINARIES_DIR}/rpi-firmware/overlays ${BOOT_DATA}/
 echo "dwc_otg.lpm_enable=0 console=tty1" > ${BOOT_DATA}/cmdline.txt
 
 # Enable 64bit support
-if [ "$BOARD_ID" == "rpi3-64" ]; then
+if [ "${BOARD_ID}" == "rpi3-64" ]; then
     echo "arm_64bit=1" >> ${BOOT_DATA}/config.txt
+    KERNEL_NAME="Image"
+else
+    KERNEL_NAME="zImage"
 fi
 
 # Create other layers
diff --git a/buildroot-external/board/raspberrypi/rpi/uboot.config b/buildroot-external/board/raspberrypi/rpi/uboot.config
index e356b99f4..b2a22b5e1 100644
--- a/buildroot-external/board/raspberrypi/rpi/uboot.config
+++ b/buildroot-external/board/raspberrypi/rpi/uboot.config
@@ -1,2 +1,3 @@
 CONFIG_TARGET_RPI=y
 CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
+CONFIG_SYS_TEXT_BASE=0x00008000
diff --git a/buildroot-external/board/raspberrypi/rpi0-w/uboot.config b/buildroot-external/board/raspberrypi/rpi0-w/uboot.config
index 03d63bb2e..0b4f39372 100644
--- a/buildroot-external/board/raspberrypi/rpi0-w/uboot.config
+++ b/buildroot-external/board/raspberrypi/rpi0-w/uboot.config
@@ -1,2 +1,3 @@
 CONFIG_TARGET_RPI_0_W=y
 CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w"
+CONFIG_SYS_TEXT_BASE=0x00008000
diff --git a/buildroot-external/board/raspberrypi/rpi2/uboot.config b/buildroot-external/board/raspberrypi/rpi2/uboot.config
index 3dfc63491..4b9c35d07 100644
--- a/buildroot-external/board/raspberrypi/rpi2/uboot.config
+++ b/buildroot-external/board/raspberrypi/rpi2/uboot.config
@@ -1,2 +1,4 @@
 CONFIG_TARGET_RPI_2=y
 CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
+CONFIG_SYS_TEXT_BASE=0x00008000
+CONFIG_SYS_TEXT_BASE=0x00008000
diff --git a/buildroot-external/board/raspberrypi/rpi3-64/uboot.config b/buildroot-external/board/raspberrypi/rpi3-64/uboot.config
index 146b73e26..550b90c67 100644
--- a/buildroot-external/board/raspberrypi/rpi3-64/uboot.config
+++ b/buildroot-external/board/raspberrypi/rpi3-64/uboot.config
@@ -1,5 +1,6 @@
 CONFIG_TARGET_RPI_3=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SYS_TEXT_BASE=0x00080000
 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
 CONFIG_PHYLIB=y
 CONFIG_USB_ETHER_LAN78XX=y
diff --git a/buildroot-external/board/raspberrypi/rpi3/uboot.config b/buildroot-external/board/raspberrypi/rpi3/uboot.config
index 33ccec60d..1290a4ba9 100644
--- a/buildroot-external/board/raspberrypi/rpi3/uboot.config
+++ b/buildroot-external/board/raspberrypi/rpi3/uboot.config
@@ -1,5 +1,6 @@
 CONFIG_TARGET_RPI_3_32B=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SYS_TEXT_BASE=0x00008000
 CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
 CONFIG_PHYLIB=y
 CONFIG_USB_ETHER_LAN78XX=y
diff --git a/buildroot-external/board/raspberrypi/uboot.config b/buildroot-external/board/raspberrypi/uboot.config
index c89061bf2..f9c0cf01c 100644
--- a/buildroot-external/board/raspberrypi/uboot.config
+++ b/buildroot-external/board/raspberrypi/uboot.config
@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
-CONFIG_SYS_TEXT_BASE=0x00008000
 CONFIG_OF_BOARD_SETUP=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y