diff --git a/root/target/linux/ipq40xx/image/generic.mk b/root/target/linux/ipq40xx/image/generic.mk
index cc8eefec..dbf4b1a1 100644
--- a/root/target/linux/ipq40xx/image/generic.mk
+++ b/root/target/linux/ipq40xx/image/generic.mk
@@ -35,7 +35,7 @@ define Device/DniImage
 	IMAGES += factory.img
 	IMAGE/factory.img := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | netgear-dni
 	IMAGE/sysupgrade.bin := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | \
-		append-rootfs | pad-rootfs | check-size | append-metadata
+		append-rootfs | pad-rootfs | append-metadata | check-size
 endef
 
 define Build/append-rootfshdr
@@ -62,7 +62,6 @@ define Build/mkmylofw_32m
 	@mv $@.new $@
 endef
 
-
 define Build/qsdk-ipq-factory-nand-askey
 	$(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh $@.its\
 		askey_kernel $(IMAGE_KERNEL) \
@@ -97,7 +96,7 @@ define Device/8dev_habanero-dvk
 	IMAGE_SIZE := 30976k
 	SOC := qcom-ipq4019
 	DEVICE_PACKAGES := ipq-wifi-8dev_habanero-dvk
-	IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | check-size | append-metadata
+	IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | append-metadata | check-size
 endef
 TARGET_DEVICES += 8dev_habanero-dvk
 
@@ -213,7 +212,7 @@ define Device/avm_fritzbox-4040
 	UBOOT_PARTITION_SIZE := 524288
 	IMAGES += eva.bin
 	IMAGE/eva.bin := append-uboot | pad-to $$$$(UBOOT_PARTITION_SIZE) | append-kernel | append-rootfs | pad-rootfs
-	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
+	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size
 	DEVICE_PACKAGES := fritz-tffs fritz-caldata
 endef
 TARGET_DEVICES += avm_fritzbox-4040
@@ -500,18 +499,6 @@ define Device/glinet_gl-ap1300
 endef
 TARGET_DEVICES += glinet_gl-ap1300
 
-define Device/glinet_gl-b1300
-	$(call Device/FitzImage)
-	DEVICE_VENDOR := GL.iNet
-	DEVICE_MODEL := GL-B1300
-	BOARD_NAME := gl-b1300
-	SOC := qcom-ipq4029
-	KERNEL_SIZE := 4096k
-	IMAGE_SIZE := 26624k
-	IMAGE/sysupgrade.bin := append-kernel |append-rootfs | pad-rootfs | append-metadata
-endef
-TARGET_DEVICES += glinet_gl-b1300
-
 define Device/zbt_z4019
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
@@ -524,8 +511,20 @@ define Device/zbt_z4019
 endef
 TARGET_DEVICES += zbt_z4019
 
+define Device/glinet_gl-b1300
+	$(call Device/FitImage)
+	DEVICE_VENDOR := GL.iNet
+	DEVICE_MODEL := GL-B1300
+	BOARD_NAME := gl-b1300
+	SOC := qcom-ipq4029
+	KERNEL_SIZE := 4096k
+	IMAGE_SIZE := 26624k
+	IMAGE/sysupgrade.bin := append-kernel |append-rootfs | pad-rootfs | append-metadata
+endef
+TARGET_DEVICES += glinet_gl-b1300
+
 define Device/glinet_gl-s1300
-	$(call Device/FitzImage)
+	$(call Device/FitImage)
 	DEVICE_VENDOR := GL.iNet
 	DEVICE_MODEL := GL-S1300
 	SOC := qcom-ipq4029
@@ -828,7 +827,7 @@ define Device/zyxel_wre6606
 	DEVICE_DTS_CONFIG := config@4
 	SOC := qcom-ipq4018
 	IMAGE_SIZE := 13184k
-	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
+	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size
 	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
 endef
-TARGET_DEVICES += zyxel_wre6606
+TARGET_DEVICES += zyxel_wre6606
\ No newline at end of file