diff --git a/docker-compose.yml b/docker-compose.yml
index c391b41..906ec53 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,6 @@ x-common-service:
 x-mailserver-service:
   &mailserver-service
   <<: *common-service
-  hostname: mail
   domainname: freedoh.net
   environment:
     ENABLE_SPAMASSASSIN: "${ENABLE_SPAMASSASSIN:-1}"
@@ -64,26 +63,48 @@ services:
   # Primary mailserver instance
   mailserver:
     <<: *mailserver-service
+  hostname: mail
+    image: mailserver/docker-mailserver:latest
+    container_name: dms
+    profiles:
+      - both
+    environment:
+      ENABLE_FAIL2BAN: "0"
+
+  mailserver:
+    <<: *mailserver-service
+  hostname: imap
     image: mailserver/docker-mailserver:latest
     container_name: dms
     profiles:
       - imap
+    environment:
+      ENABLE_FAIL2BAN: "0"
+      
+  mailserver:
+    <<: *mailserver-service
+  hostname: smtp
+    image: mailserver/docker-mailserver:latest
+    container_name: dms
+    profiles:
       - smtp
     environment:
       ENABLE_FAIL2BAN: "0"
 
+  #~ # Fail2Ban-enabled mailserver instance
+  #~ mailserver-fail2ban:
+    #~ <<: *mailserver-service
+    #~ hostname: mail
+    #~ image: mailserver/docker-mailserver:latest
+    #~ container_name: dms
+    #~ profiles:
+      #~ - fail2ban
+    #~ environment:
+      #~ ENABLE_FAIL2BAN: "1"
+    #~ cap_add:
+      #~ - NET_ADMIN # Required for Fail2Ban
   # Fail2Ban-enabled mailserver instance
-  mailserver-fail2ban:
-    <<: *mailserver-service
-    image: mailserver/docker-mailserver:latest
-    container_name: dms
-    profiles:
-      - fail2ban
-    environment:
-      ENABLE_FAIL2BAN: "1"
-    cap_add:
-      - NET_ADMIN # Required for Fail2Ban
-
+  
   rspamd:
     <<: *common-service
     image: rspamd/rspamd