diff --git a/src/config/repoAccess.ts b/src/config/repoAccess.ts
index fd356a1..e1ea59e 100644
--- a/src/config/repoAccess.ts
+++ b/src/config/repoAccess.ts
@@ -475,6 +475,18 @@ export const REPOSITORY_ACCESS: RepositoryAccess[] = [
       { team: 'file-uploads-wg', permission: 'admin' },
     ],
   },
+  {
+    repository: 'governance-wg',
+    settings: {
+      description:
+        'Governance documentation and working materials for the MCP Governance Working Group.',
+    },
+    teams: [
+      { team: 'core-maintainers', permission: 'admin' },
+      { team: 'moderators', permission: 'maintain' },
+      { team: 'governance-wg', permission: 'admin' },
+    ],
+  },
   {
     repository: 'maintainer-docs',
     teams: [
diff --git a/src/config/roleIds.ts b/src/config/roleIds.ts
index edf48a2..769553b 100644
--- a/src/config/roleIds.ts
+++ b/src/config/roleIds.ts
@@ -69,6 +69,7 @@ export const ROLE_IDS = {
   FILESYSTEMS_WG_LEADS: 'filesystems-wg-leads',
   CORE_PRIMITIVE_WG: 'core-primitive-wg',
   INFRASTRUCTURE_WG: 'infrastructure-wg',
+  GOVERNANCE_WG: 'governance-wg',
 
   // ===================
   // Interest Groups
diff --git a/src/config/roles.ts b/src/config/roles.ts
index f361e44..3d0a748 100644
--- a/src/config/roles.ts
+++ b/src/config/roles.ts
@@ -409,6 +409,12 @@ export const ROLES: readonly Role[] = [
     github: { team: 'infrastructure-wg', parent: ROLE_IDS.WORKING_GROUPS },
     discord: { role: 'infrastructure working group (synced)' },
   },
+  {
+    id: ROLE_IDS.GOVERNANCE_WG,
+    description: 'Governance Working Group',
+    github: { team: 'governance-wg', parent: ROLE_IDS.WORKING_GROUPS },
+    discord: { role: 'governance working group (synced)' },
+  },
 
   // ===================
   // Interest Groups
diff --git a/src/config/users.ts b/src/config/users.ts
index 8065ea8..ae42a97 100644
--- a/src/config/users.ts
+++ b/src/config/users.ts
@@ -558,7 +558,9 @@ export const MEMBERS: readonly Member[] = [
   {
     github: 'kziemski',
     discord: '312056735248416770',
-    memberOf: [ROLE_IDS.FILESYSTEMS_WG],
+    firstName: 'Kryspin',
+    lastName: 'Ziemski',
+    memberOf: [ROLE_IDS.FILESYSTEMS_WG, ROLE_IDS.GOVERNANCE_WG],
   },
   {
     github: 'liady',
@@ -568,6 +570,13 @@ export const MEMBERS: readonly Member[] = [
     googleEmailPrefix: 'liad',
     memberOf: [ROLE_IDS.WORKING_GROUPS, ROLE_IDS.MCP_APPS_WG, ROLE_IDS.MCP_APPS_SDK],
   },
+  {
+    github: 'linsun',
+    discord: '1212420366199165032',
+    firstName: 'Lin',
+    lastName: 'Sun',
+    memberOf: [ROLE_IDS.GOVERNANCE_WG],
+  },
   {
     github: 'localden',
     discord: '1351224014143754260',
@@ -802,6 +811,7 @@ export const MEMBERS: readonly Member[] = [
       ROLE_IDS.FINANCIAL_SERVICES_IG,
       ROLE_IDS.MODERATORS,
       ROLE_IDS.SKILLS_OVER_MCP_WG,
+      ROLE_IDS.GOVERNANCE_WG,
       ROLE_IDS.INTERCEPTORS_WG,
       ROLE_IDS.APPEALS,
     ],
@@ -928,7 +938,14 @@ export const MEMBERS: readonly Member[] = [
     firstName: 'Sarah',
     lastName: 'Novotny',
     googleEmailPrefix: 'sarah',
-    memberOf: [ROLE_IDS.MAINTAINERS],
+    memberOf: [ROLE_IDS.GOVERNANCE_WG, ROLE_IDS.MAINTAINERS],
+  },
+  {
+    github: 'schlpbch',
+    discord: '1467977452969267412',
+    firstName: 'Andreas',
+    lastName: 'Schlapbach',
+    memberOf: [ROLE_IDS.GOVERNANCE_WG],
   },
   {
     github: 'sdubov',