diff --git a/templates/postfix/main.cf.j2 b/templates/postfix/main.cf.j2
index 0f68ff0..1a6a89d 100644
--- a/templates/postfix/main.cf.j2
+++ b/templates/postfix/main.cf.j2
@@ -2,8 +2,10 @@
 
 smtpd_banner = {{ postfix_smtpd_banner }}
 
+{% if postfix_debug_peer_list is defined %}
 ### Debug Logging
-#debug_peer_list =
+debug_peer_list = {{ postfix_debug_peer_list | join(', ') }}
+{% endif %}
 
 ### Protocols and destinations
 inet_interfaces = all
@@ -136,10 +138,12 @@ postscreen_greet_action = drop
 
 # DNS block lists
 postscreen_dnsbl_threshold = 2
+{% if postfix_postscreen_dnsbl_sites is defined %}
+{% for site in postfix_postscreen_dnsbl_sites %}
 postscreen_dnsbl_sites =
-    bl.spamcop.net*1
-    ix.dnsbl.manitu.net*2
-    zen.spamhaus.org*2
+    {{ site.name }}*{{ site.multiplier }}
+{% endfor %}
+{% endif %}
 postscreen_dnsbl_action = drop
 
 # Postfix runs restrictions with the following order