diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index b134ada..47ff813 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -161,9 +161,13 @@ services:
 {% endif %}
 {% if container.healthcheck is defined %}
     healthcheck:
-      test: {{ container.healthcheck.test }}
+      test: "{{ container.healthcheck.test }}"
+{% if container.healthcheck.interval is defined %}
       interval: {{ container.healthcheck.interval }}
+{% endif %}
+{% if container.healthcheck.timeout is defined %}
       timeout: {{ container.healthcheck.timeout }}
+{% endif %}
 {% if container.healthcheck.retries is defined %}
       retries: {{ container.healthcheck.retries }}
 {% endif %}