diff --git a/docs/community/extensions.md b/docs/community/extensions.md
index 40f1bdcdaa..a53dd17612 100644
--- a/docs/community/extensions.md
+++ b/docs/community/extensions.md
@@ -35,7 +35,7 @@ The following community-contributed extensions are available in [`catalog.commun
 | API Evolve | Managed API contract evolution — breaking-change detection, semver enforcement, deprecation orchestration, and lifecycle gates across REST, GraphQL, and gRPC | `process` | Read+Write | [spec-kit-api-evolve](https://github.com/Quratulain-bilal/spec-kit-api-evolve) |
 | Architect Impact Previewer | Predicts architectural impact, complexity, and risks of proposed changes before implementation. | `visibility` | Read-only | [spec-kit-architect-preview](https://github.com/UmmeHabiba1312/spec-kit-architect-preview) |
 | Architecture Governance | Keep specs, code & ADRs in sync: citation slots + a read-only, fail-closed validator | `docs` | Read+Write | [spec-kit-arch-governance](https://github.com/ashbrener/spec-kit-arch-governance) |
-| Architecture Guard | Framework-agnostic architecture review extension for validating implementation against governance and architecture constitutions, detecting architectural drift, and generating non-blocking refactor tasks | `process` | Read+Write | [spec-kit-architecture-guard](https://github.com/DyanGalih/spec-kit-architecture-guard) |
+| Architecture Guard | Framework-agnostic architecture governance for Spec Kit workflows, detecting drift, enforcing architectural rules, and generating actionable refactor tasks | `process` | Read+Write | [architecture-guard](https://github.com/DyanGalih/architecture-guard) |
 | Architecture Workflow | Generate or reverse project-level 4+1 architecture views with per-view and full-workflow commands | `docs` | Read+Write | [spec-kit-arch](https://github.com/bigsmartben/spec-kit-arch) |
 | Archive Extension | Archive merged features into main project memory, resolving gaps and conflicts. | `docs` | Read+Write | [spec-kit-archive](https://github.com/stn1slv/spec-kit-archive) |
 | ASCII Diagram Renderer | Renders hand-drawn ASCII/Unicode diagrams (state machine, architecture, flow, coverage map) of what spec/plan/tasks/analyze already say — plain text, no Mermaid renderer needed | `docs` | Read+Write | [spec-kit-ascii-diagram](https://github.com/MRZHUH/spec-kit-ascii-diagram) |
diff --git a/extensions/catalog.community.json b/extensions/catalog.community.json
index f14877c1be..a084b1616d 100644
--- a/extensions/catalog.community.json
+++ b/extensions/catalog.community.json
@@ -1,6 +1,6 @@
 {
   "schema_version": "1.0",
-  "updated_at": "2026-08-19T00:00:00Z",
+  "updated_at": "2026-08-20T00:00:00Z",
   "catalog_url": "https://raw.githubusercontent.com/github/spec-kit/main/extensions/catalog.community.json",
   "extensions": {
     "adrkit": {
@@ -396,39 +396,47 @@
     "architecture-guard": {
       "name": "Architecture Guard",
       "id": "architecture-guard",
-      "description": "Framework-agnostic architecture review extension for validating implementation against governance and architecture constitutions, detecting architectural drift, and generating non-blocking refactor tasks.",
+      "description": "Framework-agnostic architecture governance for Spec Kit workflows, detecting drift, enforcing architectural rules, and generating actionable refactor tasks.",
       "author": "DyanGalih",
-      "version": "1.13.1",
-      "download_url": "https://github.com/DyanGalih/spec-kit-architecture-guard/archive/refs/tags/v1.13.1.zip",
-      "repository": "https://github.com/DyanGalih/spec-kit-architecture-guard",
-      "homepage": "https://github.com/DyanGalih/spec-kit-architecture-guard",
-      "documentation": "https://github.com/DyanGalih/spec-kit-architecture-guard/blob/main/docs/architecture-overview.md",
-      "changelog": "https://github.com/DyanGalih/spec-kit-architecture-guard/releases",
+      "version": "2.3.6",
+      "download_url": "https://github.com/DyanGalih/architecture-guard/archive/refs/tags/v2.3.6.zip",
+      "repository": "https://github.com/DyanGalih/architecture-guard",
+      "homepage": "https://github.com/DyanGalih/architecture-guard",
+      "documentation": "https://github.com/DyanGalih/architecture-guard/blob/main/SPECKIT-INTEGRATION.md",
+      "changelog": "https://github.com/DyanGalih/architecture-guard/blob/main/docs/release-notes.md",
       "license": "MIT",
       "category": "process",
       "effect": "read-write",
       "requires": {
-        "speckit_version": ">=0.1.0"
+        "speckit_version": ">=0.1.0",
+        "tools": [
+          {
+            "name": "node",
+            "version": ">=18",
+            "required": false
+          },
+          {
+            "name": "npm",
+            "required": false
+          }
+        ]
       },
       "provides": {
-        "commands": 14,
+        "commands": 18,
         "hooks": 3
       },
       "tags": [
         "architecture",
-        "spec-kit",
+        "governance",
         "review",
         "refactor",
-        "workflow",
-        "governance",
-        "guardrails",
-        "hygiene"
+        "workflow"
       ],
       "verified": false,
       "downloads": 0,
       "stars": 0,
       "created_at": "2026-05-05T07:26:00Z",
-      "updated_at": "2026-07-24T00:00:00Z"
+      "updated_at": "2026-08-20T00:00:00Z"
     },
     "archive": {
       "name": "Archive Extension",