diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index f5bac00..dec19f2 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -251,14 +251,13 @@ jobs:
           DIRECTUS_KEY=${{ secrets.DIRECTUS_KEY || vars.DIRECTUS_KEY }}
           DIRECTUS_SECRET=${{ secrets.DIRECTUS_SECRET || vars.DIRECTUS_SECRET }}
           
-          # SMTP Config
-          SMTP_HOST=${{ secrets.SMTP_HOST || vars.SMTP_HOST }}
-          SMTP_PORT=${{ secrets.SMTP_PORT || vars.SMTP_PORT || '587' }}
-          SMTP_SECURE=${{ secrets.SMTP_SECURE || vars.SMTP_SECURE || 'false' }}
-          SMTP_USER=${{ secrets.SMTP_USER || vars.SMTP_USER }}
-          SMTP_PASS=${{ secrets.SMTP_PASS || vars.SMTP_PASS }}
-          SMTP_FROM=${{ secrets.SMTP_FROM || vars.SMTP_FROM }}
-          CONTACT_RECIPIENT=${{ secrets.CONTACT_RECIPIENT || vars.CONTACT_RECIPIENT }}
+          # Mail
+          MAIL_HOST=${{ secrets.SMTP_HOST || vars.SMTP_HOST }}
+          MAIL_PORT=${{ secrets.SMTP_PORT || vars.SMTP_PORT || '587' }}
+          MAIL_USERNAME=${{ secrets.SMTP_USER || vars.SMTP_USER }}
+          MAIL_PASSWORD=${{ secrets.SMTP_PASS || vars.SMTP_PASS }}
+          MAIL_FROM=${{ secrets.SMTP_FROM || vars.SMTP_FROM }}
+          MAIL_RECIPIENTS=${{ secrets.CONTACT_RECIPIENT || vars.CONTACT_RECIPIENT }}
 
           # Authentication
           GATEKEEPER_PASSWORD=${{ secrets.GATEKEEPER_PASSWORD || vars.GATEKEEPER_PASSWORD }}
diff --git a/app/api/contact/route.ts b/app/api/contact/route.ts
index 4f301aa..108507b 100644
--- a/app/api/contact/route.ts
+++ b/app/api/contact/route.ts
@@ -56,19 +56,20 @@ export async function POST(req: Request) {
 
     // 2. Email sending
     try {
+      const { config } = await import("@/lib/config");
       const transporter = nodemailer.createTransport({
-        host: process.env.SMTP_HOST,
-        port: parseInt(process.env.SMTP_PORT || "587"),
-        secure: process.env.SMTP_SECURE === "true",
+        host: config.mail.host,
+        port: config.mail.port,
+        secure: config.mail.port === 465,
         auth: {
-          user: process.env.SMTP_USER,
-          pass: process.env.SMTP_PASS,
+          user: config.mail.user,
+          pass: config.mail.pass,
         },
       });
 
       await transporter.sendMail({
-        from: process.env.SMTP_FROM,
-        to: process.env.CONTACT_RECIPIENT || "info@mb-grid-solutions.com",
+        from: config.mail.from,
+        to: config.mail.recipients.join(",") || "info@mb-grid-solutions.com",
         replyTo: email,
         subject: `Kontaktanfrage von ${name}`,
         text: `