diff --git a/DMS/docker-compose.yml b/DMS/docker-compose.yml
index c1e2072..01a5c77 100644
--- a/DMS/docker-compose.yml
+++ b/DMS/docker-compose.yml
@@ -1,7 +1,11 @@
 services:
 
   mailserver:
-    image: docker.io/mailserver/docker-mailserver:latest
+    # image: docker.io/mailserver/docker-mailserver:latest  # AUSKOMMENTIERT
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: dms-custom:latest
     container_name: mailserver-new
     hostname: mail.email-srvr.com
     domainname: email-srvr.com
@@ -52,6 +56,10 @@ services:
       - RELAY_PORT=587
       - RELAY_USER=${SES_SMTP_USER}
       - RELAY_PASSWORD=${SES_SMTP_PASSWORD}
+      # Content Filter AWS Credentials
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+      - AWS_REGION=us-east-2      
       # Weitere Einstellungen
       - POSTFIX_OVERRIDE_HOSTNAME=email-srvr.com
       - POSTFIX_MYNETWORKS=172.16.0.0/12 172.17.0.0/12 172.18.0.0/12 [::1]/128 [fe80::]/64
@@ -88,7 +96,6 @@ services:
       - ROUNDCUBEMAIL_DEFAULT_PORT=993
       - ROUNDCUBEMAIL_SMTP_SERVER=tls://mail.email-srvr.com
       - ROUNDCUBEMAIL_SMTP_PORT=587
-      #- ROUNDCUBEMAIL_PLUGINS=password,managesieve
       - ROUNDCUBEMAIL_PLUGINS=password,email_config
     volumes:
       - ./docker-data/roundcube/config:/var/roundcube/config