diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b86067..0375bb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,8 @@ stages:
 # Globale Variablen
 # -----------------------------------------
 variables:
-  BASE_DIRS: "src public api partials"   # alle zu deployenden dirs
-  CONFIG_BASE_DIR: "config"             # Basis-Konfigordner
+  BASE_DIRS: "src public api partials"   # alle normalen Deploy-Verzeichnisse
+  CONFIG_BASE_DIR: "config"             # Basis-Konfigordner im Repo
 
 # -----------------------------------------
 # Deployment auf STAGING
@@ -16,8 +16,8 @@ deploy:staging:
   image: alpine:3.20
 
   variables:
-    TARGET_PATH: "${FTP_PATH_STAGING}"
-    CONFIG_ENV_DIR: "config/staging"
+    TARGET_PATH: "${FTP_PATH_STAGING}"   # z.B. staging/ oder /usbcheck/staging/
+    CONFIG_ENV_DIR: "config/staging"     # env-spezifische Config-Quelle
 
   before_script:
     - echo "📡 Installing lftp..."
@@ -39,25 +39,30 @@ deploy:staging:
         fi
       done
 
-  script: &deploy_script
+  script:
     - |
-      set -e
-
       echo "📁 Prüfe lokale Basisverzeichnisse..."
+      MISSING=0
+
       for d in $BASE_DIRS; do
         if [ ! -d "$d" ]; then
-          echo "❌ Verzeichnis '$d/' fehlt im Repo! Abbruch."
-          exit 1
+          echo "❌ Verzeichnis '$d/' fehlt im Repo!"
+          MISSING=1
         fi
       done
 
       if [ ! -d "$CONFIG_BASE_DIR" ]; then
-        echo "❌ Basis-Konfig-Verzeichnis '$CONFIG_BASE_DIR/' fehlt! Abbruch."
-        exit 1
+        echo "❌ Basis-Konfig-Verzeichnis '$CONFIG_BASE_DIR/' fehlt!"
+        MISSING=1
       fi
 
       if [ ! -d "$CONFIG_ENV_DIR" ]; then
-        echo "❌ Env-Konfiguration '$CONFIG_ENV_DIR/' fehlt! Abbruch."
+        echo "❌ Env-Konfiguration '$CONFIG_ENV_DIR/' fehlt!"
+        MISSING=1
+      fi
+
+      if [ "$MISSING" -ne 0 ]; then
+        echo "⛔ Abbruch wegen fehlender Verzeichnisse."
         exit 1
       fi
 
@@ -73,10 +78,10 @@ deploy:staging:
           set ssl:verify-certificate no;
           mirror -R --make-dirs --delete --exclude .gitkeep ${d}/ ${TARGET_PATH}${d}/;
           bye
-        "
+        " || { echo "❌ Upload für Verzeichnis '${d}' fehlgeschlagen."; exit 1; }
       done
 
-      # Config separat behandeln: config/staging|prod → <TARGET_PATH>/config/
+      # Config separat behandeln: config/staging → <TARGET_PATH>/config/
       echo "🔁 Sync ${CONFIG_ENV_DIR}/ → ${TARGET_PATH}${CONFIG_BASE_DIR}/"
       lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "
         set ftp:ssl-force true;
@@ -86,7 +91,7 @@ deploy:staging:
         lcd ${CONFIG_ENV_DIR};
         mirror -R --make-dirs --delete --exclude .gitkeep ./ ${TARGET_PATH}${CONFIG_BASE_DIR}/;
         bye
-      "
+      " || { echo "❌ Upload für Config-Verzeichnis '${CONFIG_ENV_DIR}' fehlgeschlagen."; exit 1; }
 
       echo "✅ Deploy ${CI_ENVIRONMENT_NAME} abgeschlossen."
 
@@ -126,7 +131,59 @@ deploy:production:
         fi
       done
 
-  script: *deploy_script
+  script:
+    - |
+      echo "📁 Prüfe lokale Basisverzeichnisse..."
+      MISSING=0
+
+      for d in $BASE_DIRS; do
+        if [ ! -d "$d" ]; then
+          echo "❌ Verzeichnis '$d/' fehlt im Repo!"
+          MISSING=1
+        fi
+      done
+
+      if [ ! -d "$CONFIG_BASE_DIR" ]; then
+        echo "❌ Basis-Konfig-Verzeichnis '$CONFIG_BASE_DIR/' fehlt!"
+        MISSING=1
+      fi
+
+      if [ ! -d "$CONFIG_ENV_DIR" ]; then
+        echo "❌ Env-Konfiguration '$CONFIG_ENV_DIR/' fehlt!"
+        MISSING=1
+      fi
+
+      if [ "$MISSING" -ne 0 ]; then
+        echo "⛔ Abbruch wegen fehlender Verzeichnisse."
+        exit 1
+      fi
+
+      echo "🚀 Deploy ${CI_ENVIRONMENT_NAME} → ${FTP_HOST}:${TARGET_PATH}"
+
+      for d in $BASE_DIRS; do
+        echo "🔁 Sync ${d}/ → ${TARGET_PATH}${d}/"
+        lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "
+          set ftp:ssl-force true;
+          set ftp:passive-mode true;
+          set ftp:ssl-protect-data true;
+          set ssl:verify-certificate no;
+          mirror -R --make-dirs --delete --exclude .gitkeep ${d}/ ${TARGET_PATH}${d}/;
+          bye
+        " || { echo "❌ Upload für Verzeichnis '${d}' fehlgeschlagen."; exit 1; }
+      done
+
+      echo "🔁 Sync ${CONFIG_ENV_DIR}/ → ${TARGET_PATH}${CONFIG_BASE_DIR}/"
+      lftp -u "${FTP_USER}","${FTP_PASSWORD}" "${FTP_HOST}" -e "
+        set ftp:ssl-force true;
+        set ftp:passive-mode true;
+        set ftp:ssl-protect-data true;
+        set ssl:verify-certificate no;
+        lcd ${CONFIG_ENV_DIR};
+        mirror -R --make-dirs --delete --exclude .gitkeep ./ ${TARGET_PATH}${CONFIG_BASE_DIR}/;
+        bye
+      " || { echo "❌ Upload für Config-Verzeichnis '${CONFIG_ENV_DIR}' fehlgeschlagen."; exit 1; }
+
+      echo "✅ Deploy ${CI_ENVIRONMENT_NAME} abgeschlossen."
 
   environment:
     name: production