diff --git a/layers/meta-nwl-distro/classes/nwl-image-fitimage.bbclass b/layers/meta-nwl-distro/classes/nwl-image-fitimage.bbclass
index c11099d..d80fe46 100644
--- a/layers/meta-nwl-distro/classes/nwl-image-fitimage.bbclass
+++ b/layers/meta-nwl-distro/classes/nwl-image-fitimage.bbclass
@@ -83,3 +83,24 @@ python __anonymous () {
             task = task.replace(f'initramfs_path="{deploy_dir_image}', f'initramfs_path="{imgdeploydir}')
             d.setVar('fitimage_assemble', task)
 }
+
+# Glue for coreos-image-ci.bbclass
+# ==============================================================================
+
+def get_nwl_fitimage_ci_artifacts(d):
+    bundle = d.getVar('INITRAMFS_IMAGE_BUNDLE')
+    initramfs = d.getVar('INITRAMFS_IMAGE_NAME')
+
+    # We only support fitimage with INITRAMFS_IMAGE_BUNDLE set to 0
+    if bundle == "1":
+        return ""
+
+    # If an initramfs is used, publish the fitImage that contains it
+    # otherwise the image without an initramfs
+    if initramfs.strip() != "":
+        return "fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_BIN_EXT}"
+    else:
+        return "fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}${KERNEL_FIT_BIN_EXT}"
+
+# Add the generated fitImage to the list of artifacts to publish in the CI
+COREOS_CI_DEPLOY_ARTIFACTS += "${@get_nwl_fitimage_ci_artifacts(d)}"