diff --git a/requeue-email.sh b/requeue-email.sh
index 2ec3f1c..91d94c0 100644
--- a/requeue-email.sh
+++ b/requeue-email.sh
@@ -7,18 +7,18 @@ set -e
 
 # Parameter prüfen
 if [ $# -lt 2 ]; then
-    echo "Usage: $0 <BUCKET> <S3_KEY> [FROM] [RECIPIENTS]"
+    echo "Usage: $0 <DOMAIN> <S3_KEY> [FROM] [RECIPIENTS]"
     echo ""
     echo "RECIPIENTS kann kommagetrennt sein, z.B. user1@domain.com,user2@domain.com"
     echo "Falls FROM und RECIPIENTS nicht angegeben, werden sie aus der E-Mail extrahiert."
     echo "Example:"
-    echo "  $0 bayarea-cc-emails rgskc3d59dqdm6lq1scenpuvdq7ikhi3cqk382g1"
-    echo "  oder mit manuellen Werten: $0 bayarea-cc-emails rgskc3d59dqdm6lq1scenpuvdq7ikhi3cqk382g1 sender@example.com user@bayarea-cc.com"
+    echo "  $0 bayarea-cc.com rgskc3d59dqdm6lq1scenpuvdq7ikhi3cqk382g1"
+    echo "  oder mit manuellen Werten: $0 bayarea-cc.com rgskc3d59dqdm6lq1scenpuvdq7ikhi3cqk382g1 sender@example.com user@bayarea-cc.com"
     echo ""
     exit 1
 fi
 
-BUCKET=$1
+DOMAIN=$1
 S3_KEY=$2
 FROM=${3:-}
 RECIPIENTS=${4:-}
@@ -26,12 +26,16 @@ RECIPIENTS=${4:-}
 # Konfiguration
 AWS_REGION="us-east-2"
 
+# Bucket-Name aus Domain ableiten
+BUCKET="${DOMAIN//./-}-emails"
+
 # Temporäre Datei für E-Mail
 TEMP_FILE="/tmp/email-${S3_KEY}.eml"
 
 echo "==================================="
 echo "Requeue E-Mail zu SQS Queue"
 echo "==================================="
+echo "Domain:     $DOMAIN"
 echo "Bucket:     $BUCKET"
 echo "S3 Key:     $S3_KEY"
 
@@ -83,16 +87,20 @@ if [ -z "$FROM" ] || [ -z "$RECIPIENTS" ]; then
     exit 1
 fi
 
-# Domain aus erstem Recipient extrahieren
+# Domain aus erstem Recipient extrahieren und validieren
 FIRST_RECIPIENT=$(echo "$RECIPIENTS" | cut -d',' -f1)
-DOMAIN=$(echo "$FIRST_RECIPIENT" | cut -d'@' -f2)
+EXTRACTED_DOMAIN=$(echo "$FIRST_RECIPIENT" | cut -d'@' -f2)
+
+if [ "$EXTRACTED_DOMAIN" != "$DOMAIN" ]; then
+    echo "ERROR: Extrahierte Domain ($EXTRACTED_DOMAIN) passt nicht zur angegebenen Domain ($DOMAIN)."
+    exit 1
+fi
 
 # Queue-Name aus Domain ableiten
 QUEUE_NAME="${DOMAIN//./-}-queue"
 
 echo "From:       $FROM"
 echo "Recipients: $RECIPIENTS"
-echo "Domain:     $DOMAIN"
 echo "Queue:      $QUEUE_NAME"
 echo ""