diff --git a/conf.py b/conf.py
index d36a920156..866e761748 100644
--- a/conf.py
+++ b/conf.py
@@ -52,7 +52,7 @@ modules_support_matrix_reverse = defaultdict(list)
 for board, modules in modules_support_matrix.items():
     for module in modules:
         modules_support_matrix_reverse[module].append(board)
-modules_support_matrix_reverse = dict((module, ", ".join(boards)) for module, boards in modules_support_matrix_reverse.items())
+modules_support_matrix_reverse = dict((module, sorted(boards)) for module, boards in modules_support_matrix_reverse.items())
 
 html_context = {
     'support_matrix': modules_support_matrix,
diff --git a/docs/autoapi/templates/python/module.rst b/docs/autoapi/templates/python/module.rst
index 7db1c73d37..f1fee865f7 100644
--- a/docs/autoapi/templates/python/module.rst
+++ b/docs/autoapi/templates/python/module.rst
@@ -19,8 +19,12 @@
 
     <p>
     <details>
-    <summary>Module Availability</summary>
-    Available on: {{ support_matrix_reverse[obj.name] }}
+    <summary>Available on these boards</summary>
+    <ul>
+    {% for board in support_matrix_reverse[obj.name] %}
+    <li> {{ board }}
+    {% endfor %}
+    </ul>
     </details>
     </p>