diff --git a/web/pandas/about/team.md b/web/pandas/about/team.md
index 261d577b2abc1..c3e5ef0a968eb 100644
--- a/web/pandas/about/team.md
+++ b/web/pandas/about/team.md
@@ -44,22 +44,26 @@ Wes McKinney is the Benevolent Dictator for Life (BDFL).
 
 The project governance is available in the [project governance page](governance.html).
 
-## Code of conduct committee
+## Workgroups
 
-<ul>
-    {% for person in maintainers.coc %}
-        <li>{{ person }}</li>
-    {% endfor %}
-</ul>
+{% for k, workgroup in workgroups.items() %}
 
-## NumFOCUS committee
+### {{ workgroup.name }}
 
 <ul>
-    {% for person in maintainers.numfocus %}
-        <li>{{ person }}</li>
-    {% endfor %}
+    <li><b>Contact:</b> <a href="mailto:{{ workgroup.contact }}">{{ workgroup.contact }}</a></li>
+    <li><b>Responsibilities:</b> {{ workgroup.responsibilities }}</li>
+    <li><b>Members:</b>
+        <ul>
+            {% for person in workgroup.members %}
+                <li>{{ person }}{% if loop.first %} (lead){% endif %}</li>
+            {% endfor %}
+        </ul>
+    </li>
 </ul>
 
+{% endfor %}
+
 ## Inactive maintainers
 
 <ul>
diff --git a/web/pandas/config.yml b/web/pandas/config.yml
index 3489f3dbbe47d..77dfac41ba4d7 100644
--- a/web/pandas/config.yml
+++ b/web/pandas/config.yml
@@ -102,17 +102,41 @@ maintainers:
   - jschendel
   - charlesdong1991
   - dsaxton
+workgroups:
   coc:
-  - Bijay Regmi
-  - Wuraola Oyewusi
-  - Мария Чакчурина
-  - Tom Augspurger
-  numfocus:
-  - Wes McKinney
-  - Jeff Reback
-  - Joris Van den Bossche
-  - Tom Augspurger
-  - Matthew Roeschke
+    name: Code of Conduct
+    contact: coc@pandas.pydata.org
+    responsibilities: "Make sure pandas is the welcoming and inclusive community we want it to be. Keeping the CoC updated, and addressing violation reports."
+    members:
+    - Tom Augspurger
+    - Bijay Regmi
+    - Wuraola Oyewusi
+    - Мария Чакчурина
+  finance:
+    name: Finance
+    contact: finance@pandas.pydata.org
+    responsibilities: "Approve the project expenses."
+    members:
+    - Wes McKinney
+    - Jeff Reback
+    - Joris Van den Bossche
+    - Tom Augspurger
+    - Matthew Roeschke
+  infrastructure:
+    name: Infrastructure
+    contact: infrastructure@pandas.pydata.org
+    responsibilities: "Keep the pandas infrastructure up and working. In particular the servers for the website, benchmarks, CI and others needed."
+    members:
+    - Marc Garcia
+    - Matthew Roeschke
+    - Thomas Li
+  communications:
+    name: Communications
+    contact: communications@pandas.pydata.org
+    responsibilities: "Share relevant information with the broader community, mainly via our social networks, as well as being the main point of contact between NumFOCUS and the core team."
+    members:
+    - Marco Gorelli
+    - Marc Garcia
 sponsors:
   active:
   - name: "NumFOCUS"