diff --git a/.env.sample b/.env.sample
index bd17a3c..674444e 100644
--- a/.env.sample
+++ b/.env.sample
@@ -45,7 +45,7 @@ DISABLE_STATISTICS=True
 ADMIN=true
 
 # Choose which webmail to run if any (values: roundcube, rainloop, none)
-WEBMAIL=rainloop
+WEBMAIL=snappymail
 
 # Dav server implementation (value: radicale, none)
 WEBDAV=none
@@ -53,6 +53,9 @@ WEBDAV=none
 # Antivirus solution (value: clamav, none)
 ANTIVIRUS=none
 
+# Scan Macros solution (value: true, false)
+SCAN_MACROS=true
+
 ###################################
 # Mail settings
 ###################################
@@ -72,6 +75,9 @@ RELAYNETS=
 # Will relay all outgoing mails if configured
 RELAYHOST=
 
+# Enable fetchmail
+FETCHMAIL_ENABLED=False
+
 # Fetchmail delay
 FETCHMAIL_DELAY=600
 
diff --git a/compose.yml b/compose.yml
index 3c056e8..c54cdc2 100644
--- a/compose.yml
+++ b/compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 
 x-environment:
   &default-env
-  - HOST_FRONT=${STACK_NAME}_app
+  - FRONT_ADDRESS=${STACK_NAME}_app
   - ADMIN
   - ANTIVIRUS
   - AUTH_RATELIMIT_IP
@@ -51,7 +51,7 @@ x-environment:
 
 services:
   app:
-    image: ghcr.io/mailu/nginx:1.9
+    image: ghcr.io/mailu/nginx:2.0.16
     logging:
       driver: json-file
     networks:
@@ -91,39 +91,47 @@ services:
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "coop-cloud.${STACK_NAME}.version=0.2.1+1.9"
-
+  
   db:
     image: redis:alpine
     volumes:
       - "redis:/data"
 
   admin:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:1.9
+    image: ghcr.io/mailu/admin:2.0.16
     environment: *default-env
     healthcheck:
       disable: true
     volumes:
       - "dkim:/dkim"
       - "mailu:/data"
+    networks:
+      - default
 
   imap:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}dovecot:1.9
+    image: ghcr.io/mailu/dovecot:2.0.16
     environment: *default-env
     volumes:
       - "mail:/mail"
     healthcheck:
       disable: true
+    depends_on:
+      - app
+    networks:
+      - default
 
   smtp:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}postfix:1.9
+    image: ghcr.io/mailu/postfix:2.0.16
     environment: *default-env
     volumes:
       - "mailqueue:/queue"
     healthcheck:
       disable: true
+    depends_on:
+      - app
 
   antispam:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:1.9
+    image: ghcr.io/mailu/rspamd:2.0.16
     environment: *default-env
     volumes:
       - "rspamd:/var/lib/rspamd"
@@ -132,7 +140,7 @@ services:
       disable: true
 
   webmail:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rainloop:1.9
+    image: ghcr.io/mailu/webmail:2.0.16
     environment: *default-env
     networks:
       - default