diff --git a/core/Dockerfile b/core/Dockerfile
index 02e919c..d40e72b 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -22,4 +22,4 @@ EXPOSE 8001
 
 ENTRYPOINT ["/opt/run.sh"]
 
-CMD ["/usr/local/bin/master", "-C",  "/config/mailman.cfg"]
+CMD ["/usr/local/bin/master"]
diff --git a/core/assets/run.sh b/core/assets/run.sh
index b8d172d..a486404 100755
--- a/core/assets/run.sh
+++ b/core/assets/run.sh
@@ -97,10 +97,10 @@ class: $DATABASE_CLASS
 url: $DATABASE_URL
 EOF
 
-if [[ -e /opt/mailman/mailman.cfg ]]
+if [[ -e /opt/mailman/mailman-extra.cfg ]]
 then
-	echo "Found configuration file at /opt/mailman/mailman.cfg"
-	cat /opt/mailman/mailman.cfg >> /config/mailman.cfg
+	echo "Found configuration file at /opt/mailman/mailman-extra.cfg"
+	cat /opt/mailman/mailman-extra.cfg >> /config/mailman.cfg
 fi
 
 
@@ -122,5 +122,6 @@ base_url: $HYPERKITTY_URL
 api_key: $HYPERKITTY_API_KEY
 EOF
 
+export MAILMAN_CONFIG_FILE=/config/mailman.cfg
 
 exec "$@"