diff --git a/update/hisinone_bi_qisserver/modules_update.sh b/update/hisinone_bi_qisserver/modules_update.sh
index ba4e506..b0d8c59 100755
--- a/update/hisinone_bi_qisserver/modules_update.sh
+++ b/update/hisinone_bi_qisserver/modules_update.sh
@@ -313,6 +313,15 @@ else
     echo "Sende Fehler-Logmail (falls konfiguriert)."
 
     attach_args=()
+
+    # Bei MAIL_ATTACH_LOGS_MODE=always auch die Logs der erfolgreichen Module anhängen
+    if [ "$MAIL_ATTACH_LOGS_MODE" = "always" ]; then
+        for f in "${SUCCESS_LOG_FILES[@]}"; do
+            [ -f "$f" ] && attach_args+=("-a" "$f")
+        done
+    fi
+
+    # Fehler-Logs immer anhängen
     for f in "${ERROR_LOG_FILES[@]}"; do
         [ -f "$f" ] && attach_args+=("-a" "$f")
     done
@@ -323,3 +332,4 @@ else
         "$MASTERLOG" \
         "${attach_args[@]}"
 fi
+
diff --git a/upgrade/hisinone_bi_qisserver/modules_upgrade.sh b/upgrade/hisinone_bi_qisserver/modules_upgrade.sh
index c0c4fe8..0ec9f91 100755
--- a/upgrade/hisinone_bi_qisserver/modules_upgrade.sh
+++ b/upgrade/hisinone_bi_qisserver/modules_upgrade.sh
@@ -308,21 +308,30 @@ if [ "$ERROR_FLAG" -eq 0 ]; then
     fi
 
     send_log_mail \
-        "${MAIL_BETREFF_UPGRADE:-BI Job Upgrade}${MAIL_BETREFF_SUFFIX_ERFOLGREICH:-}" \
+        "${MAIL_BETREFF_UPGRADE:-BI Job Update}${MAIL_BETREFF_SUFFIX_ERFOLGREICH:-}" \
         "$MASTERLOG" \
         "${attach_args[@]}"
 
 else
-    echo "Sende Fehler-Logmail (Upgrade, falls konfiguriert)."
+    echo "Sende Fehler-Logmail (falls konfiguriert)."
 
     attach_args=()
+
+    # Bei MAIL_ATTACH_LOGS_MODE=always auch die Logs der erfolgreichen Module anhängen
+    if [ "$MAIL_ATTACH_LOGS_MODE" = "always" ]; then
+        for f in "${SUCCESS_LOG_FILES[@]}"; do
+            [ -f "$f" ] && attach_args+=("-a" "$f")
+        done
+    fi
+
+    # Fehler-Logs immer anhängen
     for f in "${ERROR_LOG_FILES[@]}"; do
         [ -f "$f" ] && attach_args+=("-a" "$f")
     done
 
     # Fehlerfall → Fehlermail an ERRORMAIL (oder Fallback LOGMAIL), mit Attachments
     send_error_mail \
-        "${MAIL_BETREFF_UPGRADE:-BI Job Upgrade}${MAIL_BETREFF_SUFFIX_FEHLER:-}" \
+        "${MAIL_BETREFF_UPGRADE:-BI Job Update}${MAIL_BETREFF_SUFFIX_FEHLER:-}" \
         "$MASTERLOG" \
         "${attach_args[@]}"
 fi