diff --git a/defaults/main.yml b/defaults/main.yml
index 1cd9335..ca14a32 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -34,6 +34,7 @@ zigbee2mqtt_channel: 11
 zigbee2mqtt_cache_state: True
 # zigbee2mqtt_network_key: [1, 3, 5, 7, 9, 11, 13, 15, 0, 2, 4, 6, 8, 10, 12, 13] # defaults to not set
 zigbee2mqtt_last_seen: "disable"
+zigbee2mqtt_elapsed: False
 zigbee2mqtt_report_enabled: False
 
 zigbee2mqtt_homeassistant_discovery_topic: homeassistant
diff --git a/templates/zigbee2mqtt/data/configuration.yaml.j2 b/templates/zigbee2mqtt/data/configuration.yaml.j2
index 473909e..3155da6 100644
--- a/templates/zigbee2mqtt/data/configuration.yaml.j2
+++ b/templates/zigbee2mqtt/data/configuration.yaml.j2
@@ -5,27 +5,27 @@ homeassistant: "{{ zigbee2mqtt_homeassistant_enabled }}"
 permit_join: "{{ zigbee2mqtt_permit_join }}"
 
 mqtt:
-  base_topic: '"{{ zigbee2mqtt_mqtt_base_topic }}"'
-  server: '"{{ zigbee2mqtt_mqtt_server }}"'
+  base_topic: "{{ zigbee2mqtt_mqtt_base_topic }}"
+  server: "{{ zigbee2mqtt_mqtt_server }}"
   {% if zigbee2mqtt_mqtt_user is defined and zigbee2mqtt_mqtt_user and zigbee2mqtt_mqtt_password is defined and zigbee2mqtt_mqtt_password %}
-  user: '"{{ zigbee2mqtt_mqtt_user }}"'
-  password: '"{{ zigbee2mqtt_mqtt_password }}"'
+  user: "{{ zigbee2mqtt_mqtt_user }}"
+  password: "{{ zigbee2mqtt_mqtt_password }}"
   {% endif %}
-  client_id: '"{{ zigbee2mqtt_mqtt_client_id }}"'
-  reject_unauthorized: "{{ zigbee2mqtt_mqtt_reject_unauthorized }}"
-  include_device_information: "{{ zigbee2mqtt_mqtt_include_device_information }}"
+  client_id: "{{ zigbee2mqtt_mqtt_client_id }}"
+  reject_unauthorized: {{ zigbee2mqtt_mqtt_reject_unauthorized }}
+  include_device_information: {{ zigbee2mqtt_mqtt_include_device_information }}
 {% if zigbee2mqtt_serial_port is defined and zigbee2mqtt_serial_port %}
 
 serial:
-  port: '"{{ zigbee2mqtt_serial_port }}"'
-  disable_led: "{{ zigbee2mqtt_serial_disable_led }}"
+  port: "{{ zigbee2mqtt_serial_port }}"
+  disable_led: {{ zigbee2mqtt_serial_disable_led }}
 {% endif %}
 {% if zigbee2mqtt_devices_ban %}
 
 # Ban devices from the network (by ieeeAddr)
 ban:
   {% for item in zigbee2mqtt_devices_ban %}
-  - '{{ item }}'
+  - "{{ item }}"
   {% endfor %}
 {% endif %}
 {% if zigbee2mqtt_devices_whitelist %}
@@ -33,25 +33,25 @@ ban:
 # Whitelist devices from the network (by ieeeAddr)
 whitelist:
   {% for item in zigbee2mqtt_devices_whitelist %}
-  - '{{ item }}'
+  - "{{ item }}"
   {% endfor %}
 {% endif %}
 
 advanced:
-  pan_id: "{{ zigbee2mqtt_pan_id }}"
-  ext_pan_id: "{{ zigbee2mqtt_ext_pan_id }}"
-  channel: "{{ zigbee2mqtt_channel }}"
-  cache_state: "{{ zigbee2mqtt_cache_state }}"
+  pan_id: {{ zigbee2mqtt_pan_id }}
+  ext_pan_id: {{ zigbee2mqtt_ext_pan_id }}
+  channel: {{ zigbee2mqtt_channel }}
+  cache_state: {{ zigbee2mqtt_cache_state }}
   log_level: "{{ zigbee2mqtt_log_level }}"
   log_directory: "{{ zigbee2mqtt_log_dir }}"
   {% if zigbee2mqtt_network_key is defined and zigbee2mqtt_network_key %}
-  network_key: "{{ zigbee2mqtt_network_key }}"
+  network_key: {{ zigbee2mqtt_network_key }}
   {% endif %}
-  last_seen: '{{ zigbee2mqtt_last_seen }}'
-  elapsed: false
+  last_seen: "{{ zigbee2mqtt_last_seen }}"
+  elapsed: "{{ zigbee2mqtt_elapsed }}"
   report: "{{ zigbee2mqtt_report_enabled }}"
-  homeassistant_discovery_topic: '"{{ zigbee2mqtt_homeassistant_discovery_topic }}"'
-  homeassistant_status_topic: '"{{ zigbee2mqtt_homeassistant_status_topic }}'
+  homeassistant_discovery_topic: "{{ zigbee2mqtt_homeassistant_discovery_topic }}"
+  homeassistant_status_topic: "{{ zigbee2mqtt_homeassistant_status_topic }}"
 
 queue:
   delay: 250