diff --git a/www/openstack-projects.html b/www/openstack-projects.html
index 7a8f8519dd..d05997d7ed 100644
--- a/www/openstack-projects.html
+++ b/www/openstack-projects.html
@@ -80,26 +80,12 @@
 
     <div class="docs-link-sections">
         <h3><i class="fa fa-cog"></i> Contributor Tools</h3>
-        <a href="/devstack/latest/">
-            DevStack (DevStack)</a><br />
-        <a href="/reno/latest/">
-            Release Notes Manager (reno)</a><br />
-        <a href="/tempest/latest/">
-            Tempest Test Suite for OpenStack</a><br />
-    </div>
-
-    <div class="docs-link-sections">
-        <h3><i class="fa fa-book"></i> Related Projects</h3>
-        <a href="/bandit/latest/">bandit</a><br />
-        <p>Security linter for Python.</p>
-        <a href="/bashate/latest/">bashate</a><br />
-        <p>Linter for bash scripts.</p>
-        <a href="/grenade/latest/">grenade</a><br />
-        <p>Grenade is an OpenStack test harness to exercise the upgrade process between releases.</p>
-        <a href="/refstack/latest/">refstack</a><br />
-        <p>RefStack is a toolset for testing interoperability between OpenStack clouds.</p>
-        <a href="/syntribos/latest/">syntribos</a><br />
-        <p>Automated API security testing tool.</p>
+{% for project in projects|sort(attribute='name') %}
+{% if project.type in ['tool'] %}
+        <a href="/{{project.name}}/latest/">{{project.name}}</a><br />
+        <p>{{project.service}} </p>
+{% endif %}
+{% endfor %}
     </div>
 
             </div>
diff --git a/www/project-data/latest.yaml b/www/project-data/latest.yaml
index 46cf43fbc6..d7984b6f7e 100644
--- a/www/project-data/latest.yaml
+++ b/www/project-data/latest.yaml
@@ -548,6 +548,38 @@
   service: Theme and extension support for Sphinx documentation for official projects
   type: library
 
+- name: devstack
+  service: DevStack
+  type: tool
+
+- name: reno
+  service: Release Notes Manager
+  type: tool
+
+- name: tempest
+  service: Tempest Test Suite for OpenStack
+  type: tool
+
+- name: bandit
+  service: Security linter for Python.
+  type: tool
+
+- name: bashate
+  service: Linter for bash scripts.
+  type: tool
+
+- name: grenade
+  service: Test harness to exercise the upgrade process between releases.
+  type: tool
+
+- name: refstack
+  service: Toolset for testing interoperability between OpenStack clouds.
+  type: tool
+
+- name: syntribos
+  service: Automated API security testing tool.
+  type: tool
+
 # Projects that do not appear in the service-types-authority list:
 # - kuryr
 # - dragonflow
diff --git a/www/project-data/schema.yaml b/www/project-data/schema.yaml
index 6dc15e0e7d..5dbfb7896c 100644
--- a/www/project-data/schema.yaml
+++ b/www/project-data/schema.yaml
@@ -16,7 +16,7 @@ items:
       type: string
     type:
       type: string
-      enum: ["service", "client", "library", "other"]
+      enum: ["service", "client", "library", "tool", "other"]
     description:
       type: string
     has_install_guide: