diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 2798d49..2e38a14 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -78,7 +78,3 @@ api-dev.bizmatch.net {
   }
 
 }
-
-mail.bizmatch.net {
-  reverse_proxy dovecot:143 
-}
\ No newline at end of file
diff --git a/certbot/docker-compose.yml b/certbot/docker-compose.yml
index d33e531..163fc5e 100644
--- a/certbot/docker-compose.yml
+++ b/certbot/docker-compose.yml
@@ -4,4 +4,7 @@ services:
     volumes:
       - ./letsencrypt:/etc/letsencrypt
       - ./cloudflare:/cloudflare
-    command: certonly --dns-cloudflare --dns-cloudflare-credentials /cloudflare/cloudflare.ini --email deine-email@example.com --agree-tos --no-eff-email -d mail.haiky.app
\ No newline at end of file
+    environment:
+      - DOMAIN=${DOMAIN:-mail.haiky.app}  # Standardwert, falls nicht gesetzt
+      - EMAIL=${EMAIL:-deine-email@example.com}  # Standardwert, falls nicht gesetzt
+    command: certonly --dns-cloudflare --dns-cloudflare-credentials /cloudflare/cloudflare.ini --email ${EMAIL:-deine-email@example.com} --agree-tos --no-eff-email -d ${DOMAIN:-mail.haiky.app}
\ No newline at end of file