diff --git a/pillar.example b/pillar.example
index dbe06567071b3df45d3707c4cf7f5ef91ac70750..7048fb2b39840edb2b0b4ba08cd5464f9a4b10d3 100644
--- a/pillar.example
+++ b/pillar.example
@@ -3,3 +3,4 @@ postfix:
     message_size_limit: '10240000'
     relayhost: 'smtp.example.com'
     rootmail-destination: 'rootmails@example.com'
+    docker-support: False
diff --git a/postfix/nullclient/etc/postfix/main.cf b/postfix/nullclient/etc/postfix/main.cf
index 79d1f7e1166dba3c06dc31bdbe3038aa8ce30f41..c181a788e441b379507efdcbbd230cad828408c1 100644
--- a/postfix/nullclient/etc/postfix/main.cf
+++ b/postfix/nullclient/etc/postfix/main.cf
@@ -36,11 +36,11 @@ local_recipient_maps = unix:passwd.byname
 
 mydestination = {{ minion_id }}, localhost
 relayhost = {{ pillar['relayhost'] }}
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
+mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 {% if pillar['docker-support'] %}172.16.0.0/12{% endif %}
 mailbox_command = procmail -a "$EXTENSION"
 mailbox_size_limit = 0
 recipient_delimiter = +
-inet_interfaces = 127.0.0.1
+inet_interfaces = 127.0.0.1{% if pillar['docker-support'] %}, 172.17.0.1{% endif %}
 
 # Allow local rewriting for (local user) sender addresses
 sender_canonical_maps = hash:/etc/postfix/sender_canonical_maps