diff --git a/Makefile b/Makefile
index dbc73bda..957ef660 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
-BR_VER = 2023.02.2
-BR_MAKE = $(MAKE) -C $(TARGET)/buildroot-$(BR_VER) BR2_EXTERNAL=$(PWD)/general O=$(TARGET)
-BR_LINK = https://github.com/buildroot/buildroot/archive
-BR_FILE = /tmp/buildroot-$(BR_VER).tar.gz
-TARGET ?= $(PWD)/output
-
 MAX_KERNEL_SIZE_NOR := 2048
 MAX_ROOTFS_SIZE_NOR := 5120
 MAX_ROOTFS_SIZE_16M := 8192
 MAX_KERNEL_SIZE_NAND := 4096
 MAX_ROOTFS_SIZE_NAND := 16384
 
+BR_VER = 2023.02.2
+BR_MAKE = $(MAKE) -C $(TARGET)/buildroot-$(BR_VER) BR2_EXTERNAL=$(PWD)/general O=$(TARGET)
+BR_LINK = https://github.com/buildroot/buildroot/archive
+BR_FILE = /tmp/buildroot-$(BR_VER).tar.gz
+TARGET ?= $(PWD)/output
+
 CONFIG = $(error variable BOARD is not defined)
 TIMER := $(shell date +%s)
 
@@ -103,8 +103,9 @@ define REPACK_FIRMWARE
 	cd $(TARGET)/images/$(3) && cp -f ../$(2) $(2).$(BR2_OPENIPC_SOC_MODEL)
 	cd $(TARGET)/images/$(3) && md5sum $(1).$(BR2_OPENIPC_SOC_MODEL) > $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum
 	cd $(TARGET)/images/$(3) && md5sum $(2).$(BR2_OPENIPC_SOC_MODEL) > $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum
-	cd $(TARGET)/images/$(3) && tar -czf ../openipc.$(BR2_OPENIPC_SOC_MODEL)-$(3)-$(BR2_OPENIPC_FLAVOR).tgz \
-		$(1).$(BR2_OPENIPC_SOC_MODEL) $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum \
-		$(2).$(BR2_OPENIPC_SOC_MODEL) $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum
+	$(eval ARCHIVE = ../openipc.$(BR2_OPENIPC_SOC_MODEL)-$(3)-$(BR2_OPENIPC_FLAVOR).tgz)
+	$(eval KERNEL = $(1).$(BR2_OPENIPC_SOC_MODEL) $(1).$(BR2_OPENIPC_SOC_MODEL).md5sum)
+	$(eval ROOTFS = $(2).$(BR2_OPENIPC_SOC_MODEL) $(2).$(BR2_OPENIPC_SOC_MODEL).md5sum)
+	cd $(TARGET)/images/$(3) && tar -czf $(ARCHIVE) $(KERNEL) $(ROOTFS)
 	rm -rf $(TARGET)/images/$(3)
 endef