diff --git a/public/images/teams/formatting.svg b/public/images/teams/formatting.svg
new file mode 100644
index 0000000000..746ceaff2b
--- /dev/null
+++ b/public/images/teams/formatting.svg
@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>NixOS</title><path fill="white" d="M7.352 1.592l-1.364.002L5.32 2.75l1.557 2.713-3.137-.008-1.32 2.34H14.11l-1.353-2.332-3.192-.006-2.214-3.865zm6.175 0l-2.687.025 5.846 10.127 1.341-2.34-1.59-2.765 2.24-3.85-.683-1.182h-1.336l-1.57 2.705-1.56-2.72zm6.887 4.195l-5.846 10.125 2.696-.008 1.601-2.76 4.453.016.682-1.183-.666-1.157-3.13-.008L21.778 8.1l-1.365-2.313zM9.432 8.086l-2.696.008-1.601 2.76-4.453-.016L0 12.02l.666 1.157 3.13.008-1.575 2.71 1.365 2.315L9.432 8.086zM7.33 12.25l-.006.01-.002-.004-1.342 2.34 1.59 2.765-2.24 3.85.684 1.182H7.35l.004-.006h.001l1.567-2.698 1.558 2.72 2.688-.026-.004-.006h.01L7.33 12.25zm2.55 3.93l1.354 2.332 3.192.006 2.215 3.865 1.363-.002.668-1.156-1.557-2.713 3.137.008 1.32-2.34H9.881Z"/></svg>
diff --git a/src/content/teams/12_formatting.mdx b/src/content/teams/12_formatting.mdx
new file mode 100644
index 0000000000..f9b197594b
--- /dev/null
+++ b/src/content/teams/12_formatting.mdx
@@ -0,0 +1,30 @@
+---
+name: Nix Formatting Team
+description: Maintains the official Nix formatter and standard format.
+members:
+- name: Silvan Mosberger
+  github: infinisil
+  title: Administrative leader, sponsored by Tweag and Antithesis
+- name: piegames
+  github: piegamesde
+  title: Main developer
+- name: Thomas Bereknyei
+  github: tomberek
+  title: Supporting developer, sponsored by Flox
+- name: "0x4A6F"
+  github: "0x4A6F"
+  title:
+- name: Sergey Gulin
+  github: Sereja313
+  title: Sponsored by Serokell
+- name: Janne Heß
+  github: dasJ
+  title:
+contact:
+- name: Team page
+  href: https://github.com/NixOS/nixfmt/tree/master/team
+---
+
+The Nix formatting team was established by [RFC 166](https://github.com/NixOS/rfcs/pull/166) and is in charge of:
+- Maintaining the [official Nix formatter](https://github.com/NixOS/nixfmt)
+- Applying the official Nix formatter to [Nixpkgs](https://github.com/nixos/nixpkgs/)
diff --git a/src/pages/community/teams/[...slug].astro b/src/pages/community/teams/[...slug].astro
index 059cdedbb4..59e800489c 100644
--- a/src/pages/community/teams/[...slug].astro
+++ b/src/pages/community/teams/[...slug].astro
@@ -35,6 +35,11 @@ const { Content } = await entry.render();
                 (<a href={"https://discourse.nixos.org/u/" + member.discourse}>@{member.discourse}</a>)
                 </>
               )}
+              {member.github && (
+                <>
+                (<a href={"https://github.com/" + member.github}>@{member.github}</a>)
+                </>
+              )}
               {member.title && (
                 <>
                 &mdash;