diff --git a/common.mk b/common.mk
index 4d5db94..a2e0d46 100644
--- a/common.mk
+++ b/common.mk
@@ -366,7 +366,7 @@
 
 .PHONY: linux-common
 linux-common: linux-defconfig
-	$(MAKE) -C $(LINUX_PATH) $(LINUX_COMMON_FLAGS)
+	$(MAKE) -C $(LINUX_PATH) $(LINUX_COMMON_FLAGS) $(LINUX_COMMON_TARGETS)
 
 $(LINUX_PATH)/.config: $(LINUX_DEFCONFIG_COMMON_FILES)
 	cd $(LINUX_PATH) && \
@@ -378,15 +378,13 @@
 linux-defconfig-clean-common:
 	rm -f $(LINUX_PATH)/.config
 
-# LINUX_CLEAN_COMMON_FLAGS should be defined in specific makefiles (hikey.mk,...)
 .PHONY: linux-clean-common
 linux-clean-common: linux-defconfig-clean
-	$(MAKE) -C $(LINUX_PATH) $(LINUX_CLEAN_COMMON_FLAGS) clean
+	$(MAKE) -C $(LINUX_PATH) $(LINUX_COMMON_FLAGS) clean
 
-# LINUX_CLEANER_COMMON_FLAGS should be defined in specific makefiles (hikey.mk,...)
 .PHONY: linux-cleaner-common
 linux-cleaner-common: linux-defconfig-clean
-	$(MAKE) -C $(LINUX_PATH) $(LINUX_CLEANER_COMMON_FLAGS) distclean
+	$(MAKE) -C $(LINUX_PATH) $(LINUX_COMMON_FLAGS) distclean
 
 ################################################################################
 # EDK2 / Tianocore
diff --git a/hikey.mk b/hikey.mk
index 4c74a82..01d62bc 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -173,7 +173,8 @@
 		LOCALVERSION= \
 		gen_init_cpio
 
-LINUX_COMMON_FLAGS += ARCH=arm64 Image hisilicon/hi6220-hikey.dtb
+LINUX_COMMON_FLAGS += ARCH=arm64
+LINUX_COMMON_TARGETS += Image hisilicon/hi6220-hikey.dtb
 
 .PHONY: linux
 linux: linux-common
diff --git a/hikey960.mk b/hikey960.mk
index 9fc8ba2..18cf8df 100644
--- a/hikey960.mk
+++ b/hikey960.mk
@@ -169,7 +169,8 @@
 		LOCALVERSION= \
 		gen_init_cpio
 
-LINUX_COMMON_FLAGS += ARCH=arm64 Image hisilicon/hi3660-hikey960.dtb
+LINUX_COMMON_FLAGS += ARCH=arm64
+LINUX_COMMON_TARGETS += Image hisilicon/hi3660-hikey960.dtb
 
 .PHONY: linux
 linux: linux-common
diff --git a/qemu.mk b/qemu.mk
index 87fb1c2..08349fe 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -124,7 +124,8 @@
 
 linux-defconfig: $(LINUX_PATH)/.config
 
-LINUX_COMMON_FLAGS += ARCH=arm zImage
+LINUX_COMMON_FLAGS += ARCH=arm
+LINUX_COMMON_TARGETS += zImage
 
 linux: linux-common
 	mkdir -p $(BINARIES_PATH)
diff --git a/qemu_v8.mk b/qemu_v8.mk
index 493caff..e577bc0 100644
--- a/qemu_v8.mk
+++ b/qemu_v8.mk
@@ -308,7 +308,8 @@
 
 linux-defconfig: $(LINUX_PATH)/.config
 
-LINUX_COMMON_FLAGS += ARCH=arm64 Image scripts_gdb
+LINUX_COMMON_FLAGS += ARCH=arm64
+LINUX_COMMON_TARGETS += Image scripts_gdb
 
 linux: linux-common
 	mkdir -p $(BINARIES_PATH)
diff --git a/rockpi4.mk b/rockpi4.mk
index 3ee7f34..d5143a0 100644
--- a/rockpi4.mk
+++ b/rockpi4.mk
@@ -124,7 +124,8 @@
 .PHONY: linux-defconfig
 linux-defconfig: $(LINUX_PATH)/.config
 
-LINUX_COMMON_FLAGS += ARCH=arm64 Image rockchip/rk3399-rock-pi-4b.dtb \
+LINUX_COMMON_FLAGS += ARCH=arm64
+LINUX_COMMON_TARGETS += Image rockchip/rk3399-rock-pi-4b.dtb \
 			$(if $(filter y,$(LINUX_MODULES)),modules)
 
 .PHONY: linux
diff --git a/stm32mp1.mk b/stm32mp1.mk
index 008a52b..bbdff8e 100644
--- a/stm32mp1.mk
+++ b/stm32mp1.mk
@@ -208,10 +208,10 @@
 
 linux-defconfig: $(LINUX_PATH)/.config
 
-LINUX_COMMON_FLAGS += ARCH=arm uImage LOADADDR=0xc2000000 \
+LINUX_COMMON_FLAGS += ARCH=arm LOADADDR=0xc2000000 \
 		      CROSS_COMPILE=$(CROSS_COMPILE_NS_KERNEL) \
-		      st/$(STM32MP1_DTS_LINUX).dtb \
 		      PATH=$$PATH:$(U_BOOT_PATH)/tools
+LINUX_COMMON_TARGETS += uImage st/$(STM32MP1_DTS_LINUX).dtb
 
 linux: linux-common
 	@$(call install_in_binaries,$(LINUX_PATH)/arch/arm/boot/$(LINUX_KERNEL_BIN))