diff --git a/scripts/create_addon b/scripts/create_addon
index dd02fc9c8f..9172cc6f1f 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -100,13 +100,14 @@ pack_addon() {
 
     # Jenkins add-on build
     if [ "$ADDON_JENKINS" = "yes" ]; then
-      ADDON_JENKINS_DIR="$TARGET_IMG/jenkins/$ADDON_VERSION/${DEVICE:-$PROJECT}/$TARGET_ARCH"
+      ADDON_JENKINS_DIR="$TARGET_IMG/jenkins"
+      ADDON_JENKINS_ADDON_NAME="$ADDON_VERSION-${DEVICE:-$PROJECT}-$TARGET_ARCH-$PKG_ADDON_ID-$ADDONVER"
       mkdir -p "$ADDON_JENKINS_DIR"
       cd $ADDON_INSTALL_DIR
-      $TOOLCHAIN/bin/7za a -l -mx0 -bsp0 -bso0 -tzip $ADDON_JENKINS_DIR/$PKG_ADDON_ID-$ADDONVER.zip $PKG_ADDON_ID-$ADDONVER.zip resources/
-      ADDON_SHA256="$(sha256sum $ADDON_JENKINS_DIR/$PKG_ADDON_ID-$ADDONVER.zip | cut -d" " -f1)"
-      echo ${ADDON_SHA256} > $ADDON_JENKINS_DIR/$PKG_ADDON_ID-$ADDONVER.zip.sha256
-      echo "*** creating $PKG_ADDON_ID.zip for Jenkins complete ***"
+      $TOOLCHAIN/bin/7za a -l -mx0 -bsp0 -bso0 -tzip $ADDON_JENKINS_DIR/$ADDON_JENKINS_ADDON_NAME.zip $PKG_ADDON_ID-$ADDONVER.zip resources/
+      ADDON_SHA256="$(sha256sum $ADDON_JENKINS_DIR/$ADDON_JENKINS_ADDON_NAME.zip | cut -d" " -f1)"
+      echo ${ADDON_SHA256} > $ADDON_JENKINS_DIR/$ADDON_JENKINS_ADDON_NAME.zip.sha256
+      echo "*** creating $ADDON_JENKINS_ADDON_NAME.zip for Jenkins complete ***"
     fi
   fi
 }