diff --git a/docker-compose/mail_ldap.yml b/docker-compose/mail.yml
similarity index 69%
rename from docker-compose/mail_ldap.yml
rename to docker-compose/mail.yml
index 797f2567581fc622018b03916b5c5b02b063b987..be1de8554ce1ec1a7cb1ec6a8fe0352552357958 100644
--- a/docker-compose/mail_ldap.yml
+++ b/docker-compose/mail.yml
@@ -1,10 +1,10 @@
 version: "3"
 
 services:
-  mail-mda-ldap:
+  mail-mda:
     build: ../pica-mail-mda/auth_LDAP
-    image: pica-mail-mda:2
-    container_name: pica-mail-mda-ldap
+    image: pica-mail-mda
+    container_name: pica-mail-mda
     networks:
       - default
     hostname: pica-mail-mda
@@ -12,16 +12,17 @@ services:
       - /var/lib/docker/volumes/mail-mda-maildir/_data:/home
       - /var/lib/docker/volumes/mail-mda-log/_data:/var/log
     
-  mail-mta-ldap:
+  mail-mta:
     build: ../pica-mail-mta
-    image: pica-mail-mta:2
-    container_name: pica-mail-mta-ldap
+    image: pica-mail-mta
+    container_name: pica-mail-mta
     networks:
       - default
     volumes:
       - /var/lib/docker/volumes/mail-mta-log/_data:/var/log
       - /DATA/docker/mail/opendkim:/etc/opendkim:ro
-    command: ldap
+    environment:
+      - LMTP_LAN_HOSTNAME=pica-mail-mda.local-mail-delivery
 
 networks:
   default: