diff --git a/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone b/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone
index f603a3d1..41b7f26e 100644
--- a/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone
+++ b/resources/chaosknoten/auth-dns/zones/hh.ccc.de.zone
@@ -1,7 +1,15 @@
 $TTL 7200
 
+; es wird jetzt der hostname mail.hamburg.ccc.de nicht mehr
+; verwendet, sondern statt dessen local-mail.hamburg.ccc.de
+; die popeye fuehlt sich immer noch unter mail.hamburg.ccc.de
+; angesprochen, und nimmt daher keine mails mit absender-adressen
+; die sie nicht kennt an.
+; ich hoffe diese aenderung arbeitet um diesen bug herum.
+; - haegar 2001.11.14
+
 @               IN      SOA     auth-dns.hamburg.ccc.de. noc.hamburg.ccc.de. (
-		        2024012601
+		2024012601
                 10800
                 3600
                 3600000
@@ -11,18 +19,16 @@ $TTL 7200
 @ NS erfadns.ber.ccc.de.
 
 		IN	MX	5 nomail.ccc.de.
+;		IN	MX	10 local-mail.hamburg.ccc.de.
 		IN	MX	23 nomail2.ccc.de.
 		IN	MX	42 nomail3.ccc.de.
 
-		; public-reverse-proxy
 		IN	A	212.12.48.125
 		IN	AAAA	2a00:14b0:4200:3000:125::1
 
-; Migration von großem C officemail zu Infra in Berlin, ggf. mit vollkorn/haegar klären
-officemail	IN	CNAME officemail.office.ccc.de.
+localhost	IN	A	127.0.0.1
 
 
-; Alter Kram, sollte nach der Netzwerkumstellung auf Chaosknoten überflüssig sein
 ; DMZ-Server:
 dmz-net		IN	A	212.12.50.208
 
@@ -33,3 +39,35 @@ LAN-212-12-51-128 IN	A	212.12.51.128
 gate		IN	A	212.12.51.129
 END-212-12-51-143 IN	A	212.12.51.143
 
+
+; convience and email
+
+backup		IN	A	172.31.16.3
+		IN	AAAA	2001:6f8:126f:1:16:20:0:3
+;		IN	MX	5 nomail.ccc.de.
+		IN	MX	10 local-mail.hamburg.ccc.de.
+
+officemail	IN	A	172.31.17.131
+		IN	MX	5 nomail.ccc.de.
+;		IN	MX	10 local-mail.hamburg.ccc.de.
+		IN	MX	23 nomail2.ccc.de.
+		IN	MX	42 nomail3.ccc.de.
+
+orga		IN	CNAME	orga.hamburg.ccc.de.
+
+
+; Die alte World, aka popeye.crew-gmbh.de
+; Legacy-Names, do not delete
+world		IN	A	192.76.134.7
+		IN	MX	10 world
+popeye		IN	A	192.76.134.7
+		IN	MX	10 world
+uucp		IN	A	192.76.134.7
+
+; ChaosVPN
+hack		IN	NS	cvpn-dns.hack
+cvpn-dns.hack	IN	A	172.31.0.5
+
+
+; tmp test
+merz.leck.eier IN TXT "kann er mal"
diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
index 2a7ffdd8..be0303fe 100644
--- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
@@ -37,6 +37,7 @@ services:
       - database:database
     volumes:
       - /opt/mailman/web:/opt/mailman-web-data
+      - ./configs/mailman-extra.cfg:/opt/mailman/core/mailman-extra.cfg
       - ./configs/settings_local.py:/opt/mailman-web/settings_local.py
       - ./files/templates:/opt/mailman-web/templates
     environment:
diff --git a/resources/chaosknoten/lists/docker_compose/mailman-extra.cfg b/resources/chaosknoten/lists/docker_compose/mailman-extra.cfg
index 29bb00ce..1ca22f32 100644
--- a/resources/chaosknoten/lists/docker_compose/mailman-extra.cfg
+++ b/resources/chaosknoten/lists/docker_compose/mailman-extra.cfg
@@ -4,16 +4,3 @@
 
 [mailman]
 pending_request_life: 7d
-
-# This address is the "site owner" address.  Certain messages which must be
-# delivered to a human, but which can't be delivered to a list owner (e.g. a
-# bounce from a list owner), will be sent to this address.  It should point to
-# a human.
-site_owner: listops@hamburg.ccc.de
-
-[mta]
-# remove any pre-existing DKIM headers from mails being forwarded through a
-# list
-remove_dkim_headers: yes
-
-# eof