diff --git a/docker-compose.yml b/docker-compose.yml
index 21f55e5..0939263 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,27 +1,42 @@
-version: "3.8"
-
 services:
   mailserver:
-    image: docker.io/docker-mailserver/docker-mailserver:release-latest
+    image: mailserver/docker-mailserver:latest
     container_name: mailserver
-    hostname: mail
-    domainname: crabs-games.art
-    env_file: mailserver.env
+    hostname: mail.crabs-games.art
     ports:
-      - "25:25"
-      - "587:587"
-      - "465:465"
-      - "110:110"
-      - "995:995"
-      - "143:143"
-      - "993:993"
-    volumes:
-      - ./data:/var/mail
-      - ./config:/tmp/docker-mailserver
-      - ./ssl:/etc/letsencrypt:ro
-      # Если есть свои сертификаты:
-      # - ./ssl/fullchain.pem:/etc/ssl/certs/ssl-cert-snakeoil.pem:ro
-      # - ./ssl/privkey.pem:/etc/ssl/private/ssl-cert-snakeoil.key:ro
+      - "25:25"      # SMTP
+      - "465:465"    # SMTPS
+      - "587:587"    # SMTP с STARTTLS
+      - "993:993"    # IMAPS
+    environment:
+      - SSL_TYPE=manual
+      - SSL_DOMAIN=mail.crabs-games.art
+      - SSL_CERT_PATH=/etc/letsencrypt/mail.crabs-games.art.crt
+      - SSL_KEY_PATH=/etc/letsencrypt/mail.crabs-games.art.key
+      - PERMIT_DOCKER=host
+      - POSTMASTER_ADDRESS=admin@crabs-games.art
+      - ENABLE_SPAMASSASSIN=1
+      - ENABLE_CLAMAV=1
+      - ENABLE_FAIL2BAN=1
+      - POSTFIX_INET_PROTOCOLS=ipv4
     cap_add:
-      - NET_ADMIN
+      - NET_ADMIN # For Fail2Ban to work
+    volumes:
+      - mail-data:/var/mail
+      - mail-state:/var/mail-state
+      - mail-logs:/var/log/mail
+      - /Users/vladimir/reproxy/var/ssl/certificates/acme-v02.api.letsencrypt.org-directory/mail.crabs-games.art:/etc/letsencrypt
     restart: always
+    networks:
+      - crabs-network
+
+networks:
+  crabs-network:
+    name: crabs-network
+    external: true
+
+volumes:
+  mail-data:
+  mail-state:
+  mail-logs:
+
diff --git a/mailserver.env b/mailserver.env
deleted file mode 100644
index 782017d..0000000
--- a/mailserver.env
+++ /dev/null
@@ -1,12 +0,0 @@
-HOSTNAME=mail
-DOMAINNAME=crabs-games.art
-POSTMASTER_ADDRESS=admin@crabs-games.art
-TZ=Europe/Moscow
-ENABLE_SPAMASSASSIN=0
-ENABLE_CLAMAV=1
-ENABLE_FAIL2BAN=1
-ONE_DIR=1
-DMS_DEBUG=0
-SSL_TYPE=manual
-SSL_CERT_PATH=/etc/letsencrypt/live/mail.crabs-games.art/fullchain.pem
-SSL_KEY_PATH=/etc/letsencrypt/live/mail.crabs-games.art/privkey.pem