diff --git a/ci/corstone1000-common.yml b/ci/corstone1000-common.yml
index 42cf4c95..5720b783 100644
--- a/ci/corstone1000-common.yml
+++ b/ci/corstone1000-common.yml
@@ -38,5 +38,5 @@ local_conf_header:
     IMAGE_INSTALL += "packagegroup-ts-tests-psa"
 
 target:
-  - corstone1000-image
+  - corstone1000-flash-firmware-image
   - perf
diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc
index 4d33b575..373dd04c 100644
--- a/meta-arm-bsp/conf/machine/include/corstone1000.inc
+++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc
@@ -44,7 +44,7 @@ MACHINE_FEATURES += "arm-ffa"
 # login terminal serial port settings
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
-WKS_FILE ?= "corstone1000-image.corstone1000.wks"
+WKS_FILE ?= "corstone1000-flash-firmware.wks.in"
 
 # making sure EXTRA_IMAGEDEPENDS will be used while creating the image
 WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-flash-firmware-image.bb
similarity index 100%
rename from meta-arm-bsp/recipes-bsp/images/corstone1000-image.bb
rename to meta-arm-bsp/recipes-bsp/images/corstone1000-flash-firmware-image.bb
diff --git a/meta-arm-bsp/recipes-bsp/images/files/corstone1000-image-capsule-update-image.json b/meta-arm-bsp/recipes-bsp/images/files/corstone1000-flash-firmware-image-capsule-update-image.json
similarity index 100%
rename from meta-arm-bsp/recipes-bsp/images/files/corstone1000-image-capsule-update-image.json
rename to meta-arm-bsp/recipes-bsp/images/files/corstone1000-flash-firmware-image-capsule-update-image.json
diff --git a/meta-arm-bsp/wic/corstone1000-image.corstone1000.wks b/meta-arm-bsp/wic/corstone1000-flash-firmware.wks.in
similarity index 100%
rename from meta-arm-bsp/wic/corstone1000-image.corstone1000.wks
rename to meta-arm-bsp/wic/corstone1000-flash-firmware.wks.in