diff --git a/templates/httpcheck.conf b/templates/httpcheck.conf
index cff64de04d1b6070057a2d216890f08688f03877..46ad4129ac2d12734ebeb5ff1f4c326253acc949 100644
--- a/templates/httpcheck.conf
+++ b/templates/httpcheck.conf
@@ -103,9 +103,14 @@ redirect: no
 {{ item.name|to_uuid }}:
     name: '{{ item.name }}'
     url: '{{ item.url }}'
+{% if item.regex is defined %}
     regex: {{ item.regex|regex_escape() }}
+{% endif %}
 {% if item.redirect|default(false) %}
     redirect: yes
 {% endif %}
+{% if item.timeout is defined %}
+    timeout: {{ item.timeout }}
+{% endif %}
 {% endif %}
 {% endfor %}