diff --git a/scripts/artifacts_name.sh b/scripts/artifacts_name.sh
index ad6a32d332bc3c615ad54b0b80bc28cdf3742261..7099d0ce1c3dfc6a94c0f1f31fe26d698fdd3b10 100644
--- a/scripts/artifacts_name.sh
+++ b/scripts/artifacts_name.sh
@@ -3,15 +3,22 @@
 TAG_NAME=$1
 DEPLOY_DATE=$2
 
-export uboot_filename="seco_"$PROCESSOR"_"$BOARD"_uboot-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
-export uboot_filename_latest="seco_"$PROCESSOR"_"$BOARD"_uboot-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
-export kernel_filename="seco_"$PROCESSOR"_"$BOARD"_kernel-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
-export kernel_filename_latest="seco_"$PROCESSOR"_"$BOARD"_kernel-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
-export filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
-export filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
-export image_name="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
-export image_name_latest="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
-export bmap_name="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
-export bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
-export bundle_filename="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
-export bundle_filename_latest="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
\ No newline at end of file
+# Check if PROCESSOR and BOARD coincide
+if [ "$PROCESSOR" = "$BOARD" ]; then
+    board_suffix=""
+else
+    board_suffix="_$BOARD"
+fi
+
+export uboot_filename="seco_"$PROCESSOR""$board_suffix"_uboot-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
+export uboot_filename_latest="seco_"$PROCESSOR""$board_suffix"_uboot-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
+export kernel_filename="seco_"$PROCESSOR""$board_suffix"_kernel-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
+export kernel_filename_latest="seco_"$PROCESSOR""$board_suffix"_kernel-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
+export filesystem_name="seco_"$PROCESSOR""$board_suffix"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
+export filesystem_name_latest="seco_"$PROCESSOR""$board_suffix"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
+export image_name="seco_"$PROCESSOR""$board_suffix"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
+export image_name_latest="seco_"$PROCESSOR""$board_suffix"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
+export bmap_name="seco_"$PROCESSOR""$board_suffix"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
+export bmap_name_latest="seco_"$PROCESSOR""$board_suffix"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
+export bundle_filename="seco_"$PROCESSOR""$board_suffix"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
+export bundle_filename_latest="seco_"$PROCESSOR""$board_suffix"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
\ No newline at end of file