diff --git a/install/tpl/postfix_2-5.conf.master b/install/tpl/postfix_2-5.conf.master
index 398dc6393c251dd66ddd619e489b75a06724dc31..f58ba0bf9bc2cf385ecae0932ff66b11fb55d5f9 100644
--- a/install/tpl/postfix_2-5.conf.master
+++ b/install/tpl/postfix_2-5.conf.master
@@ -1,11 +1,13 @@
 # Postfix configuration for version 2.5 and up
-in_flow_delay = ${stress?3}${stress:1}s
-smtp_connect_timeout = ${stress?10}${stress:30}s
-smtp_helo_timeout = ${stress?10}${stress:60}s
-smtp_mail_timeout = ${stress?10}${stress:60}s
-smtpd_error_sleep_time = ${stress?1}${stress:2}s
-smtpd_hard_error_limit = ${stress?1}${stress:10}
-smtpd_recipient_overshoot_limit = ${stress?60}${stress:600}
-smtpd_soft_error_limit = ${stress?2}${stress:5}
-smtpd_timeout = ${stress?10}${stress:60}s
+
+# These will make postfix adapt more to load spikes
+#in_flow_delay = ${stress?3}${stress:1}s
+#smtp_connect_timeout = ${stress?10}${stress:30}s
+#smtp_helo_timeout = ${stress?10}${stress:60}s
+#smtp_mail_timeout = ${stress?10}${stress:60}s
+#smtpd_error_sleep_time = ${stress?1}${stress:2}s
+#smtpd_hard_error_limit = ${stress?1}${stress:10}
+#smtpd_recipient_overshoot_limit = ${stress?60}${stress:600}
+#smtpd_soft_error_limit = ${stress?2}${stress:5}
+#smtpd_timeout = ${stress?10}${stress:60}s
 
diff --git a/install/tpl/postfix_3-0.conf.master b/install/tpl/postfix_3-0.conf.master
index a185eb6dade492adc2a13f36bd2804149409d57f..e1ce3913c4fae5f307a05c2837d2df8551965dd4 100644
--- a/install/tpl/postfix_3-0.conf.master
+++ b/install/tpl/postfix_3-0.conf.master
@@ -1,11 +1,13 @@
 # Postfix configuration for version 3.0 and up
-in_flow_delay = ${stress?{3}:{1}}s
-smtp_connect_timeout = ${stress?{10}:{30}}s
-smtp_helo_timeout = ${stress?{10}:{60}}s
-smtp_mail_timeout = ${stress?{10}:{60}}s
-smtpd_error_sleep_time = ${stress?{1}:{2}}s
-smtpd_hard_error_limit = ${stress?{1}:{10}}
-smtpd_recipient_overshoot_limit = ${stress?{60}:{600}}
-smtpd_soft_error_limit = ${stress?{2}:{5}}
-smtpd_timeout = ${stress?{10}:{60}}s
+
+# These will make postfix adapt more to load spikes
+# in_flow_delay = ${stress?{3}:{1}}s
+# smtp_connect_timeout = ${stress?{10}:{30}}s
+# smtp_helo_timeout = ${stress?{10}:{60}}s
+# smtp_mail_timeout = ${stress?{10}:{60}}s
+# smtpd_error_sleep_time = ${stress?{1}:{2}}s
+# smtpd_hard_error_limit = ${stress?{1}:{10}}
+# smtpd_recipient_overshoot_limit = ${stress?{60}:{600}}
+# smtpd_soft_error_limit = ${stress?{2}:{5}}
+# smtpd_timeout = ${stress?{10}:{60}}s