diff --git a/_data/scala-compiler-team.yml b/_data/scala-compiler-team.yml
index 8d4877020..11c20b6f5 100644
--- a/_data/scala-compiler-team.yml
+++ b/_data/scala-compiler-team.yml
@@ -1,28 +1,21 @@
-# - name: Core Team
+# - name: John Doe
 #   description: Knows everything
-#   image: /resources/img/frontpage/scala-spiral.png
-#   city: Lausanne, Switzerland
-#   email: scala.center@epfl.ch
-#   twitter: scala_lang
 #   github: scala
-#   linkedin: https://www.linkedin.com/in/janedoe/
-#   mastodon: https://fosstodon.org/@janedoe
-#   meetup: https://www.meetup.com/your/url/here
 
 - name: Martin Odersky
   description: Language Creator
   github: odersky
 
 - name: Piotr Chabelski
-  description: Product Manager
+  description: Product Manager, Specialised Engineer (Scala CLI)
   github: Gedochao
 
 - name: Tomasz Godzik
-  description: VirtusLab Compiler Team Leader
+  description: VirtusLab Compiler Team Leader, Specialised Engineer (IDE)
   github: tgodzik
 
 - name: Oliver Bračevac
-  description: LAMP Compiler Team Leader, Specialised Engineer (CC)
+  description: LAMP Compiler Team Leader, Specialised Engineer (Capture Checking)
   github: bracevac
 
 - name: Dale Wijnand
@@ -38,7 +31,7 @@
   github: EugeneFlesselle
 
 - name: Hamza Remmal
-  description: Infrastructure Manager
+  description: Infrastructure Maintainer
   github: hamzaremmal
 
 - name: Yichen Xu
diff --git a/_data/scala-core.yml b/_data/scala-core.yml
index 8bacd745c..8af44c7be 100644
--- a/_data/scala-core.yml
+++ b/_data/scala-core.yml
@@ -7,7 +7,6 @@
 #   github: scala
 #   linkedin: https://www.linkedin.com/in/janedoe/
 #   mastodon: https://fosstodon.org/@janedoe
-#   meetup: https://www.meetup.com/your/url/here
 
 - name: Martin Odersky
   description: Language Creator
@@ -15,7 +14,7 @@
   city: Lausanne, Switzerland
   github: odersky
   twitter: odersky
-  linkedin: https://www.linkedin.com/in/sethtisue/
+  linkedin: https://www.linkedin.com/in/odersky/
 
 - name: Oliver Bračevac
   description: LAMP Representative
diff --git a/development/index.md b/development/index.md
index f6556c946..a7ba8719c 100644
--- a/development/index.md
+++ b/development/index.md
@@ -192,7 +192,7 @@ maintenance practices apply in the same way to Scala Next and LTS.
 ## Schedule, Iterations and Roadmap
 
 Scala 3 is developed in iterations, according to a roadmap as designed by its
-Product Manager and governed by the Scala Core Team \[governance link\]. Each
+Product Manager and governed by the [Scala Core Team](/scala-core). Each
 iteration is tied to a given Scala Next release.
 
 The Scala Compiler Team aims for a set schedule. However, we work on a
diff --git a/governance/index.md b/governance/index.md
index f447234d2..1e8b9cba4 100644
--- a/governance/index.md
+++ b/governance/index.md
@@ -12,10 +12,10 @@ at [EPFL](https://epfl.ch).
 
 The Scala language and associated websites are cooperative projects of the
 [Scala Center](https://scala.epfl.ch) at [EPFL](https://epfl.ch), the Scala 3
-team in Martin's research group, LAMP (also at EPFL), the Scala teams at
-[Lightbend](https://www.lightbend.com) and [VirtusLab](https://virtuslab.com),
-and the Scala community more broadly, with participation from many companies,
-organizations, and individuals.
+team in Martin's research group, [LAMP](https://lamp.epfl.ch) (also at EPFL),
+the Scala teams at [Lightbend](https://www.lightbend.com) and
+[VirtusLab](https://virtuslab.com), and the Scala community more broadly, with
+participation from many companies, organizations, and individuals.
 
 Scala 2 maintenance is primarily handled by the Lightbend team. They also
 participate in Scala 3 development.
@@ -25,3 +25,11 @@ VirtusLab focuses on infrastructure and tooling for Scala 3.
 The Scala Center focuses on coordinating governance, education (especially
 online courses), documentation, open source community outreach, and tooling.
 Community participation in all of these efforts is strongly encouraged.
+
+The main decision body is the [Scala Core team](/scala-core/) which meets weekly
+to discuss issues within the language and its' ecosystem.
+
+Scala 3 development is done by the compiler team currently listed at
+[Scala Compiler Team](/maintainers/) page and Scala 2 maintainers list is
+located in [the github README](https://github.com/scala/scala#get-in-touch) of
+the scala/scala repository.