diff --git a/src/config/repoAccess.ts b/src/config/repoAccess.ts
index bbfaa13..67a8e60 100644
--- a/src/config/repoAccess.ts
+++ b/src/config/repoAccess.ts
@@ -399,6 +399,7 @@ export const REPOSITORY_ACCESS: RepositoryAccess[] = [
   },
   {
     repository: 'access',
+    teams: [{ team: 'infrastructure-wg', permission: 'admin' }],
     users: [
       { username: 'felixweinberger', permission: 'admin' },
       { username: 'maxisbey', permission: 'admin' },
@@ -410,9 +411,16 @@ export const REPOSITORY_ACCESS: RepositoryAccess[] = [
   },
   {
     repository: 'voting',
-    teams: [{ team: 'core-maintainers', permission: 'admin' }],
+    teams: [
+      { team: 'core-maintainers', permission: 'admin' },
+      { team: 'infrastructure-wg', permission: 'admin' },
+    ],
     users: [{ username: 'PederHP', permission: 'push' }],
   },
+  {
+    repository: 'mcp-spec-tpm',
+    teams: [{ team: 'infrastructure-wg', permission: 'admin' }],
+  },
 ];
 
 // GitHub Projects V2 permissions are NOT managed by Pulumi - no support yet
diff --git a/src/config/roleIds.ts b/src/config/roleIds.ts
index 4071114..07d3aa8 100644
--- a/src/config/roleIds.ts
+++ b/src/config/roleIds.ts
@@ -65,6 +65,7 @@ export const ROLE_IDS = {
   SKILLS_OVER_MCP_WG_LEADS: 'skills-over-mcp-wg-leads',
   FILESYSTEMS_WG: 'filesystems-wg',
   CORE_PRIMITIVE_WG: 'core-primitive-wg',
+  INFRASTRUCTURE_WG: 'infrastructure-wg',
 
   // ===================
   // Interest Groups
diff --git a/src/config/roles.ts b/src/config/roles.ts
index 2d4077b..5a430b1 100644
--- a/src/config/roles.ts
+++ b/src/config/roles.ts
@@ -383,6 +383,12 @@ export const ROLES: readonly Role[] = [
     github: { team: 'core-primitive-wg', parent: ROLE_IDS.WORKING_GROUPS },
     discord: { role: 'core primitive working group (synced)' },
   },
+  {
+    id: ROLE_IDS.INFRASTRUCTURE_WG,
+    description: 'Infrastructure Working Group',
+    github: { team: 'infrastructure-wg', parent: ROLE_IDS.WORKING_GROUPS },
+    discord: { role: 'infrastructure working group (synced)' },
+  },
 
   // ===================
   // Interest Groups
diff --git a/src/config/users.ts b/src/config/users.ts
index 966a0ab..5bbd3de 100644
--- a/src/config/users.ts
+++ b/src/config/users.ts
@@ -263,6 +263,7 @@ export const MEMBERS: readonly Member[] = [
       ROLE_IDS.DOCS_MAINTAINERS,
       ROLE_IDS.GO_SDK,
       ROLE_IDS.FINANCIAL_SERVICES_IG,
+      ROLE_IDS.INFRASTRUCTURE_WG,
       ROLE_IDS.MODERATORS,
       ROLE_IDS.PHP_SDK,
       ROLE_IDS.PYTHON_SDK,
@@ -289,6 +290,7 @@ export const MEMBERS: readonly Member[] = [
       ROLE_IDS.SERVER_CARD_WG,
       ROLE_IDS.AGENTS_WG,
       ROLE_IDS.CORE_PRIMITIVE_WG,
+      ROLE_IDS.INFRASTRUCTURE_WG,
       ROLE_IDS.APPEALS,
     ],
   },
@@ -541,6 +543,7 @@ export const MEMBERS: readonly Member[] = [
       ROLE_IDS.FILESYSTEMS_WG,
       ROLE_IDS.GO_SDK,
       ROLE_IDS.FINANCIAL_SERVICES_IG,
+      ROLE_IDS.INFRASTRUCTURE_WG,
       ROLE_IDS.MODERATORS,
       ROLE_IDS.PHP_SDK,
       ROLE_IDS.PYTHON_SDK,
@@ -826,6 +829,7 @@ export const MEMBERS: readonly Member[] = [
       ROLE_IDS.MAINTAINERS,
       ROLE_IDS.FILESYSTEMS_WG,
       ROLE_IDS.FINANCIAL_SERVICES_IG,
+      ROLE_IDS.INFRASTRUCTURE_WG,
       ROLE_IDS.INTERCEPTORS_WG,
       ROLE_IDS.SKILLS_OVER_MCP_WG,
       ROLE_IDS.SKILLS_OVER_MCP_WG_LEADS,