diff --git a/confluence-page.xml.jinja2 b/confluence-page.xml.jinja2
index d2a86963b712cbb0c1206234847202962c55238f..014fac29037f46b3d6b2e6f694b1cea1924538aa 100644
--- a/confluence-page.xml.jinja2
+++ b/confluence-page.xml.jinja2
@@ -41,18 +41,18 @@
                         {%- endif %}
                     </td>
                 </tr>
+                {%- if FILES_documentation is defined %}
                 <tr>
                     <th><b>Documentation</b></th>
                     <td>
-                        {%- if FILES_documentation is defined %}
                         {%- for doc_file in FILES_documentation.split(' ') | sort %}
                         {%- if doc_file.endswith(".html") %}
                         <p><a href="{{ doc_file }}">{{ (doc_file | basename | splitext)[0] }}</a></p>
                         {%- endif %}
                         {%- endfor %}
-                        {%- endif %}
                     </td>
                 </tr>
+                {%- endif %}
             </tbody>
         </table>
     </ac:rich-text-body>
@@ -76,95 +76,148 @@
                 <col style="width: 750px;" />
             </colgroup>
             <tbody>
+                {%- set files = [] -%}
+                {%- for file in FILES_machine -%}
+                {%- if file.endswith(".tar.gz") or file.endswith(".wic.img") or file.endswith(".tgz") or file.endswith(".gz") -%}
+                {%- set _ = files.append(file) -%}
+                {%- set _ = used_files.append(file) -%}
+                {%- endif -%}
+                {%- endfor -%}
+                {%- if files -%}
                 <tr>
                     <th><b>Image</b></th>
                     <td>
-                    {%- set files = [] -%}
-                    {%- for file in FILES_machine -%}
-                    {%- if file.endswith(".tar.gz") or file.endswith(".wic.img") -%}
-                    {%- set _ = files.append(file) -%}
-                    {%- set _ = used_files.append(file) -%}
-                    {%- endif -%}
-                    {%- endfor -%}
                     {%- for file in files -%}
                     <a href="{{ file }}">🔽 {{ (file | basename) }}</a>{{ "<br/>" if not loop.last else "" }}
                     {%- endfor -%}
                     </td>
                 </tr>
+                {%- endif -%}
+                {#- ------------------------------------------------------------------------------------------ -#}
+                {%- set files = [] -%}
+                {%- for file in FILES_machine -%}
+                {%- if file.endswith("init.sh") or file.endswith("update.sh") or file.endswith("install.sh") -%}
+                {%- set _ = files.append(file) -%}
+                {%- set _ = used_files.append(file) -%}
+                {%- endif -%}
+                {%- endfor -%}
+                {%- if files -%}
                 <tr>
                     <th><b>Install Script</b></th>
                     <td>
-                    {%- set files = [] -%}
-                    {%- for file in FILES_machine -%}
-                    {%- if file.endswith("fng-install.sh") -%}
-                    {%- set _ = files.append(file) -%}
-                    {%- set _ = used_files.append(file) -%}
-                    {%- endif -%}
-                    {%- endfor -%}
                     {%- for file in files -%}
                     <a href="{{ file }}">🔽 {{ (file | basename) }}</a>{{ "<br/>" if not loop.last else "" }}
                     {%- endfor -%}
                     </td>
                 </tr>
+                {%- endif -%}
+                {#- ------------------------------------------------------------------------------------------ -#}
+                {%- set files = [] -%}
+                {%- for file in FILES_machine -%}
+                {%- if "toolchain" in file and file.endswith(".sh") -%}
+                {%- set _ = files.append(file) -%}
+                {%- set _ = used_files.append(file) -%}
+                {%- endif -%}
+                {%- endfor -%}
+                {%- if files -%}
                 <tr>
                     <th><b>SDK</b></th>
                     <td>
-                    {%- set files = [] -%}
-                    {%- for file in FILES_machine -%}
-                    {%- if "toolchain" in file and file.endswith(".sh") -%}
-                    {%- set _ = files.append(file) -%}
-                    {%- set _ = used_files.append(file) -%}
-                    {%- endif -%}
-                    {%- endfor -%}
                     {%- for file in files -%}
                     <a href="{{ file }}">🔽 {{ (file | basename) }}</a>{{ "<br/>" if not loop.last else "" }}
                     {%- endfor -%}
                     </td>
                 </tr>
+                {%- endif -%}
+                {#- ------------------------------------------------------------------------------------------ -#}
+                {%- set files = [] -%}
+                {%- for file in FILES_machine -%}
+                {%- if file.endswith(".dtb") -%}
+                {%- set _ = files.append(file) -%}
+                {%- set _ = used_files.append(file) -%}
+                {%- endif -%}
+                {%- endfor -%}
+                {%- if files -%}
                 <tr>
                     <th><b>Device Trees</b></th>
                     <td>
-                    {%- set files = [] -%}
-                    {%- for file in FILES_machine -%}
-                    {%- if file.endswith(".dtb") -%}
-                    {%- set _ = files.append(file) -%}
-                    {%- set _ = used_files.append(file) -%}
-                    {%- endif -%}
-                    {%- endfor -%}
                     {%- for file in files -%}
                     <a href="{{ file }}">🔽 {{ (file | basename) }}</a>{{ "<br/>" if not loop.last else "" }}
                     {%- endfor -%}
                     </td>
                 </tr>
+                {%- endif -%}
+                {#- ------------------------------------------------------------------------------------------ -#}
+                {%- set files = [] -%}
+                {%- for file in FILES_machine -%}
+                {%- if file.endswith(".dtbo") -%}
+                {%- set _ = files.append(file) -%}
+                {%- set _ = used_files.append(file) -%}
+                {%- endif -%}
+                {%- endfor -%}
+                {%- if files -%}
                 <tr>
                     <th><b>Device Tree Overlays</b></th>
                     <td>
-                    {%- set files = [] -%}
-                    {%- for file in FILES_machine -%}
-                    {%- if file.endswith(".dtbo") -%}
-                    {%- set _ = files.append(file) -%}
-                    {%- set _ = used_files.append(file) -%}
-                    {%- endif -%}
+                    {%- for file in files -%}
+                    <a href="{{ file }}">🔽 {{ (file | basename) }}</a>{{ "<br/>" if not loop.last else "" }}
                     {%- endfor -%}
+                    </td>
+                </tr>
+                {%- endif -%}
+                {#- ------------------------------------------------------------------------------------------ -#}
+                {%- set files = [] -%}
+                {%- for file in FILES_machine -%}
+                {%- if "uimage" in file.lower() or "boot" in file.lower() -%}
+                {%- set _ = files.append(file) -%}
+                {%- set _ = used_files.append(file) -%}
+                {%- endif -%}
+                {%- endfor -%}
+                {%- if files -%}
+                <tr>
+                    <th><b>Bootloader</b></th>
+                    <td>
                     {%- for file in files -%}
                     <a href="{{ file }}">🔽 {{ (file | basename) }}</a>{{ "<br/>" if not loop.last else "" }}
                     {%- endfor -%}
                     </td>
                 </tr>
+                {%- endif -%}
+                {#- ------------------------------------------------------------------------------------------ -#}
+                {%- set files = [] -%}
+                {%- for file in FILES_machine -%}
+                {%- if "uuu" in file.lower() -%}
+                {%- set _ = files.append(file) -%}
+                {%- set _ = used_files.append(file) -%}
+                {%- endif -%}
+                {%- endfor -%}
+                {%- if files -%}
                 <tr>
-                    <th><b>Misc</b></th>
+                    <th><b>Provisioning tools</b></th>
                     <td>
-                    {%- set files = [] -%}
-                    {%- for file in FILES_machine -%}
-                    {%- if file not in used_files -%}
-                    {%- set _ = files.append(file) -%}
-                    {%- endif -%}
+                    {%- for file in files -%}
+                    <a href="{{ file }}">🔽 {{ (file | basename) }}</a>{{ "<br/>" if not loop.last else "" }}
                     {%- endfor -%}
+                    </td>
+                </tr>
+                {%- endif -%}
+                {#- ------------------------------------------------------------------------------------------ -#}
+                {%- set files = [] -%}
+                {%- for file in FILES_machine -%}
+                {%- if file not in used_files -%}
+                {%- set _ = files.append(file) -%}
+                {%- endif -%}
+                {%- endfor -%}
+                {%- if files -%}
+                <tr>
+                    <th><b>Misc</b></th>
+                    <td>
                     {%- for file in files -%}
                     <a href="{{ file }}">🔽 {{ (file | basename) }}</a>{{ "<br/>" if not loop.last else "" }}
                     {%- endfor -%}
                     </td>
                 </tr>
+                {%- endif -%}
             </tbody>
         </table>
     </ac:rich-text-body>