diff --git a/templates/corporate/team.html b/templates/corporate/team.html
index 998b857f20..fa7c4cf0af 100644
--- a/templates/corporate/team.html
+++ b/templates/corporate/team.html
@@ -92,7 +92,7 @@ contributors, and more than 75 with 100+ commits." %}
                     <label for="total"><i class="zulip-icon zulip-icon-globe" aria-hidden="true"></i>&nbsp; Total</label>
 
                     <input id="server" type="radio" name="tabs" />
-                    <label for="server"><i class="fa fa-server" aria-hidden="true"></i>&nbsp; Server</label>
+                    <label for="server"><i class="fa fa-server" aria-hidden="true"></i>&nbsp; Server & Web</label>
 
                     <input id="desktop" type="radio" name="tabs" />
                     <label for="desktop"><i class="fa fa-desktop" aria-hidden="true"></i>&nbsp; Desktop</label>
@@ -100,18 +100,14 @@ contributors, and more than 75 with 100+ commits." %}
                     <input id="mobile" type="radio" name="tabs" />
                     <label for="mobile"><i class="fa fa-mobile" aria-hidden="true"></i>&nbsp; Mobile</label>
 
-                    <input id="python-zulip-api" type="radio" name="tabs" />
-                    <label for="python-zulip-api"><i class="fa fa-code" aria-hidden="true"></i>&nbsp; Python API</label>
-
-                    <input id="zulip-js" type="radio" name="tabs" />
-                    <label for="zulip-js"><i class="fa fa-code" aria-hidden="true"></i>&nbsp; JS API</label>
-
-                    <input id="zulipbot" type="radio" name="tabs" />
-                    <label for="zulipbot"><i class="fa fa-at" aria-hidden="true"></i>&nbsp; Zulipbot</label>
-
                     <input id="terminal" type="radio" name="tabs" />
                     <label for="terminal"><i class="fa fa-terminal" aria-hidden="true"></i>&nbsp; Terminal</label>
 
+                    <input id="api-clients" type="radio" name="tabs" />
+                    <label for="api-clients"><i class="fa fa-code" aria-hidden="true"></i>&nbsp; Integrations</label>
+
+                    <input id="devtools" type="radio" name="tabs" />
+                    <label for="devtools"><i class="fa fa-at" aria-hidden="true"></i>&nbsp; Devtools</label>
                     <div id="tab-total" class="contributors">
                         <div class="contributors-grid"></div>
                     </div>
@@ -124,18 +120,15 @@ contributors, and more than 75 with 100+ commits." %}
                     <div id="tab-mobile" class="contributors">
                         <div class="contributors-grid"></div>
                     </div>
-                    <div id="tab-python-zulip-api" class="contributors">
-                        <div class="contributors-grid"></div>
-                    </div>
-                    <div id="tab-zulip-js" class="contributors">
-                        <div class="contributors-grid"></div>
-                    </div>
-                    <div id="tab-zulipbot" class="contributors">
-                        <div class="contributors-grid"></div>
-                    </div>
                     <div id="tab-terminal" class="contributors">
                         <div class="contributors-grid"></div>
                     </div>
+                    <div id="tab-api-clients" class="contributors">
+                        <div class="contributors-grid"></div>
+                    </div>
+                    <div id="tab-devtools" class="contributors">
+                        <div class="contributors-grid"></div>
+                    </div>
                 </div>
 
                 <!-- Compiled using lodash -->
diff --git a/tools/fetch-contributor-data b/tools/fetch-contributor-data
index df9a62ea4c..98c78167b8 100755
--- a/tools/fetch-contributor-data
+++ b/tools/fetch-contributor-data
@@ -107,15 +107,29 @@ def update_contributor_data_file() -> None:
     # the total count, including those that should *not* have tabs on the team
     # page (e.g. if they are deprecated).
     repo_names = [
+        "docker-zulip",
+        "errbot-backend-zulip",
+        "github-actions-zulip",
+        "hubot-zulip",
+        "puppet-zulip",
         "python-zulip-api",
+        "trello-to-zulip",
+        "swift-zulip-api",
+        "zulint",
         "zulip",
         "zulip-android-legacy",
+        "zulip-architecture",
+        "zulip-archive",
+        "zulip-csharp",
         "zulip-desktop",
+        "zulip-desktop-legacy",
         "zulip-flutter",
         "zulip-ios-legacy",
         "zulip-js",
         "zulip-mobile",
+        "zulip-redmine-plugin",
         "zulip-terminal",
+        "zulip-zapier",
         "zulipbot",
     ]
 
diff --git a/web/src/portico/team.ts b/web/src/portico/team.ts
index 85acc4c77e..f4f03abeca 100644
--- a/web/src/portico/team.ts
+++ b/web/src/portico/team.ts
@@ -8,39 +8,64 @@ import _ from "lodash";
 // referenced from Contributor, rather than having repository names be
 // direct keys in the namespace that also has `email`.
 const all_repository_names = [
-    "zulip",
-    "zulip-desktop",
-    "zulip-mobile",
+    "docker-zulip",
+    "errbot-backend-zulip",
+    "github-actions-zulip",
+    "hubot-zulip",
+    "puppet-zulip",
     "python-zulip-api",
-    "zulip-js",
-    "zulipbot",
-    "zulip-terminal",
-    "zulip-ios-legacy",
+    "trello-to-zulip",
+    "swift-zulip-api",
+    "zulint",
+    "zulip",
     "zulip-android-legacy",
+    "zulip-architecture",
+    "zulip-archive",
+    "zulip-csharp",
+    "zulip-desktop",
+    "zulip-desktop-legacy",
     "zulip-flutter",
+    "zulip-ios-legacy",
+    "zulip-js",
+    "zulip-mobile",
+    "zulip-redmine-plugin",
+    "zulip-terminal",
+    "zulip-zapier",
+    "zulipbot",
 ] as const;
 
 const all_tab_names = [
     "server",
     "desktop",
     "mobile",
-    "zulip-js",
-    "python-zulip-api",
-    "zulipbot",
     "terminal",
+    "api-clients",
+    "devtools",
 ] as const;
 
 type RepositoryName = (typeof all_repository_names)[number];
 type TabName = (typeof all_tab_names)[number];
 
 const tab_name_to_repo_list: Record<TabName, RepositoryName[]> = {
-    server: ["zulip"],
-    desktop: ["zulip-desktop"],
+    server: ["zulip", "docker-zulip"],
+    desktop: ["zulip-desktop", "zulip-desktop-legacy"],
     mobile: ["zulip-mobile", "zulip-flutter", "zulip-ios-legacy", "zulip-android-legacy"],
-    "zulip-js": ["zulip-js"],
-    "python-zulip-api": ["python-zulip-api"],
-    zulipbot: ["zulipbot"],
     terminal: ["zulip-terminal"],
+    "api-clients": [
+        "python-zulip-api",
+        "zulip-js",
+        "zulip-archive",
+        "errbot-backend-zulip",
+        "github-actions-zulip",
+        "hubot-zulip",
+        "puppet-zulip",
+        "trello-to-zulip",
+        "swift-zulip-api",
+        "zulip-csharp",
+        "zulip-redmine-plugin",
+        "zulip-zapier",
+    ],
+    devtools: ["zulipbot", "zulint", "zulip-architecture"],
 };
 
 export type Contributor = {
diff --git a/web/styles/portico/portico.css b/web/styles/portico/portico.css
index 7a03ab4f27..6313b2486d 100644
--- a/web/styles/portico/portico.css
+++ b/web/styles/portico/portico.css
@@ -704,9 +704,8 @@ input#total:checked ~ #tab-total,
 input#server:checked ~ #tab-server,
 input#desktop:checked ~ #tab-desktop,
 input#mobile:checked ~ #tab-mobile,
-input#python-zulip-api:checked ~ #tab-python-zulip-api,
-input#zulip-js:checked ~ #tab-zulip-js,
-input#zulipbot:checked ~ #tab-zulipbot,
+input#api-clients:checked ~ #tab-api-clients,
+input#devtools:checked ~ #tab-devtools,
 input#terminal:checked ~ #tab-terminal {
     display: block;