diff --git a/rpi3.mk b/rpi3.mk
index a64731dd63a63bff78b6eb5d4b0975b9d6f9e616..c336393c1425929cd7126a168551dfc09eb3144e 100644
--- a/rpi3.mk
+++ b/rpi3.mk
@@ -27,14 +27,14 @@ U-BOOT_PATH		?= $(ROOT)/u-boot
 U-BOOT_BIN		?= $(U-BOOT_PATH)/u-boot.bin
 U-BOOT_RPI_BIN		?= $(U-BOOT_PATH)/u-boot-rpi.bin
 
-RPI3_FIRMWARE_PATH		?= $(BUILD_PATH)/rpi3/firmware
-RPI3_HEAD_BIN			?= $(ROOT)/out/head.bin
-RPI3_BOOT_CONFIG		?= $(RPI3_FIRMWARE_PATH)/config.txt
-RPI3_UBOOT_ENV			?= $(ROOT)/out/uboot.env
-RPI3_UBOOT_ENV_TXT		?= $(RPI3_FIRMWARE_PATH)/uboot.env.txt
-RPI3_STOCK_FW_PATH		?= $(ROOT)/firmware
+RPI3_FIRMWARE_PATH	?= $(BUILD_PATH)/rpi3/firmware
+RPI3_HEAD_BIN		?= $(ROOT)/out/head.bin
+RPI3_BOOT_CONFIG	?= $(RPI3_FIRMWARE_PATH)/config.txt
+RPI3_UBOOT_ENV		?= $(ROOT)/out/uboot.env
+RPI3_UBOOT_ENV_TXT	?= $(RPI3_FIRMWARE_PATH)/uboot.env.txt
+RPI3_STOCK_FW_PATH	?= $(ROOT)/firmware
 RPI3_STOCK_FW_PATH_BOOT	?= $(RPI3_STOCK_FW_PATH)/boot
-OPTEE_OS_PAGER			?= $(OPTEE_OS_PATH)/out/arm/core/tee-pager.bin
+OPTEE_OS_PAGER		?= $(OPTEE_OS_PATH)/out/arm/core/tee-pager.bin
 
 LINUX_IMAGE		?= $(LINUX_PATH)/arch/arm64/boot/Image
 LINUX_DTB		?= $(LINUX_PATH)/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dtb