diff --git a/.env.sample b/.env.sample
index 5b8f575..cd1d23f 100644
--- a/.env.sample
+++ b/.env.sample
@@ -88,8 +88,6 @@ RELAYHOST=
 
 # Enable fetchmail
 FETCHMAIL_ENABLED=False
-#COMPOSE_FILE="$COMPOSE_FILE:compose.fetchmail.yml"
-#FETCHMAIL_ENABLED=True
 
 # Fetchmail delay
 FETCHMAIL_DELAY=600
@@ -121,7 +119,7 @@ COMPRESSION_LEVEL=
 
 # Mailman settings
 # NOTE(3wc): remember to also set RELAYNETS
-#COMPOSE_FILE="$COMPOSE_FILE:compose.mailman.yml"
+#COMPOSE_FILE="compose.yml:compose.mailman.yml"
 #MAILMAN_POSTFIX_OVERRIDES=1
 #MAILMAN_CORE_VOLUME=lists_example_com_mailman-core
 #MAILMAN_CORE_NETWORK=lists_example_com_internal
@@ -131,7 +129,7 @@ COMPRESSION_LEVEL=
 # return-path: https://www.rubydoc.info/gems/actionmailer-rack-upgrade-2/2.3.15/ActionMailer/Base
 # logins and MAIL FROM ownership: http://www.postfix.com/postconf.5.html#smtpd_relay_restrictions
 # there is an open ticket with a further discussion also https://github.com/Mailu/Mailu/issues/1096
-#COMPOSE_FILE="$COMPOSE_FILE:compose.senderlogins.yml"
+#COMPOSE_FILE="compose.yml:compose.senderlogins.yml"
 #SENDER_LOGINS_POSTFIX_OVERRIDES=1
 
 SECRET_SECRET_KEY_VERSION=v1
diff --git a/compose.fetchmail.yml b/compose.fetchmail.yml
deleted file mode 100644
index b186b5c..0000000
--- a/compose.fetchmail.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-services:
-  fetchmail:
-    image: ghcr.io/mailu/fetchmail:2.0.34
-    environment: *default-env
-    volumes:
-      - "fetchmail:/data"
-    depends_on:
-      - app
-    networks:
-      - default
-
-volumes:
-  fetchmail:
diff --git a/compose.yml b/compose.yml
index a748940..36813e1 100644
--- a/compose.yml
+++ b/compose.yml
@@ -18,7 +18,6 @@ x-environment:
   - DMARC_RUF
   - DOCKER_CONTEXT
   - DOMAIN
-  - FETCHMAIL_ENABLED
   - FETCHMAIL_DELAY
   - FULL_TEXT_SEARCH
   - HOSTNAMES