diff --git a/schema/index.yaml b/schema/index.yaml
index 8c83e5d..c827e21 100644
--- a/schema/index.yaml
+++ b/schema/index.yaml
@@ -115,6 +115,10 @@ $defs:
             type: string
           github:
             type: string
+          matrix:
+            type: string
+          email:
+            type: string
       imageUrl:
         type: string
         format: uri
@@ -166,19 +170,14 @@ properties:
     type: string
   links:
     type: object
-  core-team:
-    type: array
-    items:
-      type: object
-      additionalProperties: false
-      required:
-        - name
-      properties:
-        name:
+  teams:
+    type: object
+    additionalProperties: false
+    properties:
+      core-team:
+        type: array
+        items:
           type: string
-        refs:
-          type: object
-
   projects:
     type: array
     items:
diff --git a/src/index.yaml b/src/index.yaml
index a5ac390..8640f35 100644
--- a/src/index.yaml
+++ b/src/index.yaml
@@ -16,28 +16,12 @@ links:
   news: https://news.web3privacy.info
   telegram: https://t.me/web3privacynow
   cfp: https://cfp.web3privacy.info
-core-team:
-  - name: Mykola
-    refs:
-      github: msiusko
-      twitter: nicksvyaznoy
-      matrix: k1983:matrix.org
-  - name: Tree
-    refs:
-      github: burningtree
-      bsky: tree.fail
-      email: tree@tree.fail
-      matrix: tree:gwei.cz
-  - name: PG
-    refs:
-      github: EclecticSamurai
-      twitter: PG_CDG
-      matrix: pg_cdg:matrix.org
-  - name: Coinmandeer
-    refs:
-      github: coinmandeer
-      matrix: coinmandeer:matrix.org
-      twitter: KeenOfCoin
+teams:
+  core-team:
+    - mykola-siusko
+    - tree
+    - pg
+    - coinmandeer
 research:
   $load: research
 projects:
diff --git a/src/people/coinmandeer.yaml b/src/people/coinmandeer.yaml
index 3e3a963..0e2e65c 100644
--- a/src/people/coinmandeer.yaml
+++ b/src/people/coinmandeer.yaml
@@ -1,4 +1,5 @@
 name: Coinmandeer
 refs:
   twitter: KeenOfCoin
-  github: coinmandeer
\ No newline at end of file
+  github: coinmandeer
+  matrix: coinmandeer:matrix.org
diff --git a/src/people/mykola-siusko.yaml b/src/people/mykola-siusko.yaml
index fbb0501..9f74b94 100644
--- a/src/people/mykola-siusko.yaml
+++ b/src/people/mykola-siusko.yaml
@@ -2,4 +2,6 @@ name: Mykola Siusko
 caption: Web3 privacy advocate behind [Web3Privacy Now](https://web3privacy.info/)
 country: es
 refs:
-  twitter: nicksvyaznoy
\ No newline at end of file
+  twitter: nicksvyaznoy
+  github: msiusko
+  matrix: k1983:matrix.org
diff --git a/src/people/pg.yaml b/src/people/pg.yaml
index 8b08f92..deb0c30 100644
--- a/src/people/pg.yaml
+++ b/src/people/pg.yaml
@@ -2,4 +2,6 @@ name: PG
 caption: Organizing [ETHRome](https://ethrome.org) w/ [urbe.eth](https://linktr.ee/urbe.eth), making sauce w/ [SpaghettETH](https://linktr.ee/spaghetteth)
 country: it
 refs:
-  twitter: PG_CDG
\ No newline at end of file
+  twitter: PG_CDG
+  github: EclecticSamurai
+  matrix: pg_cdg:matrix.org
\ No newline at end of file
diff --git a/src/people/tree.yaml b/src/people/tree.yaml
index d8d0100..607cad9 100644
--- a/src/people/tree.yaml
+++ b/src/people/tree.yaml
@@ -2,4 +2,7 @@ name: Tree
 caption: Orchestrating lunarpunk events [ETHBrno](https://ethbrno.cz) & [w3ps](https://github.com/web3privacy/w3ps) w/ [gwei.cz](https://gwei.cz)
 country: cz
 refs:
-  bsky: tree.fail
\ No newline at end of file
+  github: burningtree
+  bsky: tree.fail
+  email: tree@tree.fail
+  matrix: tree:gwei.cz
\ No newline at end of file