diff --git a/source/_docs/glossary.markdown b/source/_docs/glossary.markdown
index d6373656913..806a9d011f6 100644
--- a/source/_docs/glossary.markdown
+++ b/source/_docs/glossary.markdown
@@ -7,10 +7,11 @@ description: "Home Assistant's Glossary."
 
 The glossary covers terms which are used around Home Assistant.
 
-<ul>
+{% configuration_basic %}
+
 {% for entry in entries %}
-  <li>
-      <b>{{ entry.topic }}</b>: {{ entry.description | markdownify }}
-  </li>
+  "{{ entry.topic }}":
+    description: "{{ entry.description }}"
 {% endfor %}
-</ul>
+
+{% endconfiguration_basic %}