diff --git a/dockerfiles/email-forwarder/Dockerfile b/dockerfiles/email-forwarder/Dockerfile
index b812db993c1a212cfdac866778bad6212c9485d3..bc1616484b9e4cebd902d478306abe94a55df356 100644
--- a/dockerfiles/email-forwarder/Dockerfile
+++ b/dockerfiles/email-forwarder/Dockerfile
@@ -1,7 +1,5 @@
 FROM debian:jessie
-MAINTAINER Michiel de Jong <michiel@indiehosters.net>
 
-# Borrows from https://docs.docker.com/articles/dockerfile_best-practices/
 # Borrows from https://registry.hub.docker.com/u/previousnext/postfix
 # Borrows from https://registry.hub.docker.com/u/catatnight/postfix
 
@@ -16,7 +14,7 @@ RUN apt-get update \
 		supervisor \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY assets/install.sh /opt/install.sh
+COPY install.sh /opt/install.sh
 
 VOLUME ["/etc/postfix", "/var/spool/mail", "/var/log"]
 
diff --git a/dockerfiles/email-forwarder/assets/install.sh b/dockerfiles/email-forwarder/install.sh
similarity index 74%
rename from dockerfiles/email-forwarder/assets/install.sh
rename to dockerfiles/email-forwarder/install.sh
index 6fb2b76e521bc3d4ed52b1300dac5f4f5a9b360a..d9fcba68c26db3aa630c8006fa0cd1acf85e3e7b 100755
--- a/dockerfiles/email-forwarder/assets/install.sh
+++ b/dockerfiles/email-forwarder/install.sh
@@ -35,11 +35,9 @@ cp /data/hostname /etc/mailname
 /usr/sbin/postconf -e "myhostname=`cat /data/hostname`"
 
 # put all relevant domains in /data/destinations.
-/usr/sbin/postconf -e "mydestination=`cat /data/destinations`"
+/usr/sbin/postconf -e "virtual_alias_domains=`cat /data/destinations`"
 
 #put your forwarding addresses in /data/forwards.
-echo "virtual_maps = hash:/etc/postfix/virtual, regexp:/etc/postfix/virtual-regexp" >> /etc/postfix/main.cf
-cp /data/forwards /etc/postfix/virtual-regexp
-postmap /etc/postfix/virtual-regexp
-touch /etc/postfix/virtual
+cp /data/forwards /etc/postfix/virtual
+/usr/sbin/postconf -e "virtual_alias_maps = hash:/etc/postfix/virtual"
 postmap /etc/postfix/virtual