diff --git a/iopsys-common/iopsys-fit-image.mk b/iopsys-common/iopsys-fit-image.mk
index 0331b138bd331fe3bb82e8afeb1a1552390a1e9a..0df1c316d05976d9e501cad37160e82de41d889e 100644
--- a/iopsys-common/iopsys-fit-image.mk
+++ b/iopsys-common/iopsys-fit-image.mk
@@ -233,7 +233,7 @@ define iopsys-filter-uboot-env
 endef
 
 define iowrt-kernel-fit-gen-its
-	$(if $(findstring with-u-boot-ram,$(word 2,$(1))), lzma e $@-u-boot-ram.bin $@-u-boot-ram.lzma)
+	$(if $(findstring with-u-boot-ram,$(word 2,$(1))), lzma e $(IMAGE_KERNEL)-u-boot-ram.bin $(IMAGE_KERNEL)-u-boot-ram.lzma)
 	$(if $(findstring squashfs-encrypt,$(KERNEL)), $(call sfdt))
 	$(call generate-version-dtbo,$(addsuffix -image-version,$@))
 	$(call generate-iowrt-kernel-fit-extra, $@_iowrt_kernel_fit_extra.dtsi)
@@ -243,7 +243,7 @@ define iowrt-kernel-fit-gen-its
 		-v $(LINUX_VERSION) \
 		-D $(DEVICE_NAME) \
 		-o $@.its \
-		-k $@ \
+		-k $(IMAGE_KERNEL) \
 		-C $(word 1,$(1)) \
 		$(if $(word 2,$(1)),\
 			$(if $(findstring 11, $(if $(DEVICE_DTS_OVERLAY),1)$(if $(findstring $(KERNEL_BUILD_DIR)/image-,$(word 2,$(1))),,1)), \
@@ -262,7 +262,7 @@ define iowrt-kernel-fit-gen-its
 			$(DEVICE_NAME),image)-$(dts).dtb))) \
 		$(if $(DEVICE_DTS_OVERLAY),$(foreach dtso,$(DEVICE_DTS_OVERLAY), -O $(dtso):$(KERNEL_BUILD_DIR)/image-$(dtso).dtbo)) \
 		$(if $(findstring with-u-boot-ram,$(word 2,$(1))), \
-			-R $@-u-boot-ram.lzma \
+			-R $(IMAGE_KERNEL)-u-boot-ram.lzma \
 			$(if $(UBOOT_RAM_COMPRESSION), -P $(UBOOT_RAM_COMPRESSION)) \
 			$(if $(UBOOT_RAM_LOADADDR), -U $(UBOOT_RAM_LOADADDR))) \
 		$(if $(call qstrip,$(SECURE_BOOT_FITPK)),-S $(call absolute_path, $(SECURE_BOOT_KEY_DIR)/$(SECURE_BOOT_FITPK))) \