diff --git a/tools/www-generator.py b/tools/www-generator.py
index b1b8b88549..96453268ba 100755
--- a/tools/www-generator.py
+++ b/tools/www-generator.py
@@ -315,6 +315,13 @@ _IGNORED_REPOS = [
     'openstack-infra/releasestatus',
 ]
 
+# List of infra repos that publish to the normal location (/REPO/) and
+# not to /infra/REPO.
+_INFRA_REPOS_EXCEPTION = [
+    'openstack-infra/pynotedb',
+    'openstack-infra/subunit2sql',
+]
+
 
 def _get_official_repos():
     """Return a tuple containing lists of all official repos.
@@ -341,7 +348,11 @@ def _get_official_repos():
                     # be generated.
                     continue
                 seen_repos.add(repo)
-                if repo not in _IGNORED_REPOS:
+                # Overwrite infra list for a few repositories
+                if repo in _INFRA_REPOS_EXCEPTION:
+                    regular_repos.append({'name': repo,
+                                          'base': repo.rsplit('/')[-1]})
+                elif repo not in _IGNORED_REPOS:
                     add({'name': repo, 'base': repo.rsplit('/')[-1]})
     return (regular_repos, infra_repos)
 
diff --git a/www/project-data/latest.yaml b/www/project-data/latest.yaml
index 1f1a97ecd7..4a34e77796 100644
--- a/www/project-data/latest.yaml
+++ b/www/project-data/latest.yaml
@@ -861,6 +861,14 @@
   service: Bridge between container framework and OpenStack abstractions
   type: service
 
+- name: pynotedb
+  service: Python parser for notedb
+  type: tool
+
+- name: subunit2sql
+  service: Tooling for converting subunit streams into a SQL DB
+  type: tool
+
 # Projects that do not appear in the service-types-authority list:
 # - kuryr
 # - dragonflow