diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf
index 366bee37..6cd514e8 100644
--- a/postfix/conf/main.cf
+++ b/postfix/conf/main.cf
@@ -7,6 +7,9 @@ mydomain = {{ DOMAIN }}
 myhostname = {{ HOSTNAME }}
 myorigin = $mydomain
 
+# Queue location
+queue_directory = /queue
+
 # Message size limit
 message_size_limit = {{ MESSAGE_SIZE_LIMIT }}
 
diff --git a/postfix/start.sh b/postfix/start.sh
index c0931433..3a82bf69 100755
--- a/postfix/start.sh
+++ b/postfix/start.sh
@@ -29,5 +29,7 @@ fi
 
 # Actually run Postfix
 rm -f /var/run/rsyslogd.pid
+chown -R postfix: /queue
+/usr/lib/postfix/post-install meta_directory=/etc/postfix create-missing
 /usr/lib/postfix/master &
 rsyslogd -n