diff --git a/site2/website-next/docusaurus.config.js b/site2/website-next/docusaurus.config.js
index 60a82ab4f354f..a0b10d2d35ed8 100644
--- a/site2/website-next/docusaurus.config.js
+++ b/site2/website-next/docusaurus.config.js
@@ -209,10 +209,10 @@ module.exports = {
             //   label: "Resources",
             //   to: "/:locale/resources",
             // },
-            // {
-            //   label: "Team",
-            //   to: "/:locale/team",
-            // },
+            {
+              label: "Team",
+              to: "/:locale/team",
+            },
             // {
             //   label: "Powered By",
             //   to: "/:locale/powered-by",
diff --git a/site2/website-next/src/components/TeamTable.js b/site2/website-next/src/components/TeamTable.js
new file mode 100644
index 0000000000000..59bb5327f6d93
--- /dev/null
+++ b/site2/website-next/src/components/TeamTable.js
@@ -0,0 +1,55 @@
+import * as React from "react";
+import Table from "@mui/material/Table";
+import TableBody from "@mui/material/TableBody";
+import TableCell from "@mui/material/TableCell";
+import TableRow from "@mui/material/TableRow";
+import Link from "@mui/material/Link";
+// import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
+import Translate, { translate } from "@docusaurus/Translate";
+
+export default function VersionsTable(props) {
+  // const { siteConfig } = useDocusaurusContext();
+  return (
+    <Table size="small">
+      <TableBody>
+        <TableRow key="header">
+          {["Name", "Apache Id", "Roles"].map((header) => (
+            <TableCell
+              className="border-gray-300 font-bold"
+              sx={{ border: 1, color: "inherit" }}
+              align="left"
+              key={header}
+            >
+              <Translate>{header}</Translate>
+            </TableCell>
+          ))}
+        </TableRow>
+        {props.data.map((row, index) => (
+          <TableRow key={index}>
+            <TableCell
+              className="border-gray-300 font-bold"
+              sx={{ border: 1, color: "inherit" }}
+              align="left"
+            >
+              {row.name}
+            </TableCell>
+            <TableCell
+              className="border-gray-300 font-bold"
+              sx={{ border: 1, color: "inherit" }}
+              align="left"
+            >
+              {row.apacheId}
+            </TableCell>
+            <TableCell
+              className="border-gray-300 font-bold"
+              sx={{ border: 1, color: "inherit" }}
+              align="left"
+            >
+              {row.roles}
+            </TableCell>
+          </TableRow>
+        ))}
+      </TableBody>
+    </Table>
+  );
+}
diff --git a/site2/website-next/src/components/VersionsTable.js b/site2/website-next/src/components/VersionsTable.js
index 86a09b2e0f1e6..6683e947832ca 100644
--- a/site2/website-next/src/components/VersionsTable.js
+++ b/site2/website-next/src/components/VersionsTable.js
@@ -40,7 +40,10 @@ export default function VersionsTable(props) {
                 )}
                 underline="none"
                 onClick={() => {
-                  localStorage.setItem("version", row.name);
+                  localStorage.setItem(
+                    "version",
+                    row.name == "next" ? "master" : row.name
+                  );
                 }}
               >
                 <Translate>Documentation</Translate>
diff --git a/site2/website-next/src/pages/team.js b/site2/website-next/src/pages/team.js
new file mode 100644
index 0000000000000..4644649004dc5
--- /dev/null
+++ b/site2/website-next/src/pages/team.js
@@ -0,0 +1,52 @@
+import * as React from "react";
+import Layout from "@theme/Layout";
+import TeamTable from "../components/TeamTable";
+import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
+import Translate, { translate } from "@docusaurus/Translate";
+import team from "../../data/team";
+
+export default function page(props) {
+  return (
+    <Layout>
+      <div className="tailwind">
+        <div className="my-12 container">
+          <header className="postHeader">
+            <h1>
+              <translate>Team</translate>
+            </h1>
+            <hr />
+          </header>
+          <p>
+            <translate>
+              A successful project requires many people to play many roles. Some
+              write code or documentation, while others are valuable as testers,
+              submitting patches and suggestions.
+            </translate>
+          </p>
+          <p>
+            <translate>
+              The team is comprised of PMC members, Committers and Contributors.
+              Committers have direct access to the source of a project and
+              actively evolve the codebase. Contributors improve the project
+              through submission of patches and suggestions to be reviewed by
+              the Committers. The number of Committers and Contributors to the
+              project is unbounded. Get involved today. All contributions to the
+              project are greatly appreciated.
+            </translate>
+          </p>
+
+          <h2>
+            <translate>Committers</translate>
+          </h2>
+          <p>
+            <translate>
+              The following is a list of developers with commit privileges that
+              have directly contributed to the project in one way or another.
+            </translate>
+          </p>
+          <TeamTable data={team.committers} />
+        </div>
+      </div>
+    </Layout>
+  );
+}
diff --git a/site2/website-next/src/theme/Navbar/index.js b/site2/website-next/src/theme/Navbar/index.js
index 0acfcb24fad85..ed16aa2df1cf6 100644
--- a/site2/website-next/src/theme/Navbar/index.js
+++ b/site2/website-next/src/theme/Navbar/index.js
@@ -32,7 +32,7 @@ const restApiVersions = require("../../../static/swagger/restApiVersions.json");
 const latestStableVersion = versions[0];
 
 function setVersion(version) {
-  localStorage.setItem("version", latestStableVersion);
+  localStorage.setItem("version", version == "next" ? "master" : version);
 }
 
 function getVersion() {
@@ -313,7 +313,7 @@ function Navbar() {
             }}
           />
           <a className="font-bold underline mr-4 -ml-4" href="/versions/">
-            {getVersion()}
+            {getVersion() == "master" ? "next" : getVersion()}
           </a>
           {leftItems.map((item, i) => {
             if (item.label == "REST APIs") {