diff --git a/src/config/repoAccess.ts b/src/config/repoAccess.ts
index 7fe8835..8bb61b1 100644
--- a/src/config/repoAccess.ts
+++ b/src/config/repoAccess.ts
@@ -100,6 +100,7 @@ export const REPOSITORY_ACCESS: RepositoryAccess[] = [
   },
   {
     repository: 'conformance',
+    teams: [{ team: 'conformance-auth', permission: 'push' }],
     users: [{ username: 'felixweinberger', permission: 'admin' }],
   },
   {
diff --git a/src/config/roleIds.ts b/src/config/roleIds.ts
index 57dbdbc..394d321 100644
--- a/src/config/roleIds.ts
+++ b/src/config/roleIds.ts
@@ -18,6 +18,7 @@ export const ROLE_IDS = {
   // Maintainer Groups
   // ===================
   MAINTAINERS: 'maintainers',
+  CONFORMANCE_AUTH: 'conformance-auth', // GitHub only (CODEOWNERS)
   DOCS_MAINTAINERS: 'docs-maintainers',
   INSPECTOR_MAINTAINERS: 'inspector-maintainers',
   MCPB_MAINTAINERS: 'mcpb-maintainers',
diff --git a/src/config/roles.ts b/src/config/roles.ts
index bd77477..6f032cd 100644
--- a/src/config/roles.ts
+++ b/src/config/roles.ts
@@ -129,6 +129,12 @@ export const ROLES: readonly Role[] = [
     google: { group: 'maintainers', allowExternalMembers: true },
     provisionUser: true,
   },
+  {
+    id: ROLE_IDS.CONFORMANCE_AUTH,
+    description: 'Conformance authorization-server code owners',
+    github: { team: 'conformance-auth' },
+    // GitHub only - for CODEOWNERS in the conformance repo
+  },
   {
     id: ROLE_IDS.DOCS_MAINTAINERS,
     description: 'MCP docs maintainers',
diff --git a/src/config/users.ts b/src/config/users.ts
index 9a1e78f..b2663f4 100644
--- a/src/config/users.ts
+++ b/src/config/users.ts
@@ -682,6 +682,7 @@ export const MEMBERS: readonly Member[] = [
       ROLE_IDS.DOCS_MAINTAINERS,
       ROLE_IDS.ADMINISTRATORS,
       ROLE_IDS.MODERATORS,
+      ROLE_IDS.CONFORMANCE_AUTH,
       ROLE_IDS.PYTHON_SDK,
       ROLE_IDS.PYTHON_SDK_AUTH,
       ROLE_IDS.TYPESCRIPT_SDK,
@@ -856,6 +857,10 @@ export const MEMBERS: readonly Member[] = [
     github: 'tiginamaria',
     memberOf: [ROLE_IDS.KOTLIN_SDK],
   },
+  {
+    github: 'tnorimat',
+    memberOf: [ROLE_IDS.CONFORMANCE_AUTH],
+  },
   {
     github: 'tobinsouth',
     discord: '865072069779521556',