diff --git a/docs/VULNERABILITY_CATALOG.md b/docs/VULNERABILITY_CATALOG.md
index 5763d34..343bdb2 100644
--- a/docs/VULNERABILITY_CATALOG.md
+++ b/docs/VULNERABILITY_CATALOG.md
@@ -7,12 +7,12 @@ from each file's header comment, so this page cannot drift from the source.
 
 ## Totals
 
-- **Test cases:** 62
-- **Expected detections:** 62
-- **`VULNERABLE:` markers:** 123 (individual lines a scanner should flag)
-- **`SAFE:` markers:** 73 (lines a scanner must not flag — the false-positive control group)
+- **Test cases:** 63
+- **Expected detections:** 63
+- **`VULNERABLE:` markers:** 124 (individual lines a scanner should flag)
+- **`SAFE:` markers:** 74 (lines a scanner must not flag — the false-positive control group)
 - **Languages:** 8 — dotenv, go, java, javascript, json, python, ruby, text
-- **CWE categories:** 46 — CWE-20, CWE-22, CWE-78, CWE-79, CWE-89, CWE-90, CWE-95, CWE-113, CWE-117, CWE-190, CWE-201, CWE-209, CWE-256, CWE-295, CWE-321, CWE-327, CWE-330, CWE-338, CWE-346, CWE-347, CWE-352, CWE-362, CWE-377, CWE-384, CWE-489, CWE-502, CWE-506, CWE-532, CWE-601, CWE-611, CWE-614, CWE-639, CWE-643, CWE-681, CWE-759, CWE-798, CWE-862, CWE-915, CWE-918, CWE-942, CWE-943, CWE-1236, CWE-1321, CWE-1333, CWE-1336, CWE-1357
+- **CWE categories:** 47 — CWE-20, CWE-22, CWE-78, CWE-79, CWE-89, CWE-90, CWE-95, CWE-96, CWE-113, CWE-117, CWE-190, CWE-201, CWE-209, CWE-256, CWE-295, CWE-321, CWE-327, CWE-330, CWE-338, CWE-346, CWE-347, CWE-352, CWE-362, CWE-377, CWE-384, CWE-489, CWE-502, CWE-506, CWE-532, CWE-601, CWE-611, CWE-614, CWE-639, CWE-643, CWE-681, CWE-759, CWE-798, CWE-862, CWE-915, CWE-918, CWE-942, CWE-943, CWE-1236, CWE-1321, CWE-1333, CWE-1336, CWE-1357
 
 ## How coverage is scored
 
@@ -30,6 +30,7 @@ counts as a detection. See `docs/SCANNER_INTEGRATION.md`.
 | Integer overflow and unchecked narrowing conversion | [`integer-overflow.go`](../vulns/go/integer-overflow.go) | CWE-190 | medium | yes | 2 vuln / 3 safe |
 | SQL injection via fmt.Sprintf | [`sqli-fmt-sprintf.go`](../vulns/go/sqli-fmt-sprintf.go) | CWE-89 | critical | yes | 2 vuln / 1 safe |
 | Server-side request forgery via http.Get on a user-supplied URL | [`ssrf-http-get.go`](../vulns/go/ssrf-http-get.go) | CWE-918 | high | yes | 2 vuln / 2 safe |
+| Server-Side Template Injection (SSTI) via html/template with user-controlled input | [`cwe-96-go.go`](../vulns/go/cwe-96-go.go) | CWE-96 | critical | yes | 1 vuln / 1 safe |
 
 ## Java
 
diff --git a/vulns/VULNERABILITY_CATALOG.json b/vulns/VULNERABILITY_CATALOG.json
index 153fdaf..c075679 100644
--- a/vulns/VULNERABILITY_CATALOG.json
+++ b/vulns/VULNERABILITY_CATALOG.json
@@ -2,10 +2,10 @@
   "schema": "threatcrush-testbed-catalog/1",
   "note": "Generated by scripts/generate-catalog.py \u2014 do not edit by hand.",
   "totals": {
-    "test_cases": 62,
-    "expected_detections": 62,
-    "vulnerable_markers": 123,
-    "safe_markers": 73,
+    "test_cases": 63,
+    "expected_detections": 63,
+    "vulnerable_markers": 124,
+    "safe_markers": 74,
     "languages": [
       "dotenv",
       "go",
@@ -33,6 +33,7 @@
       "CWE-89",
       "CWE-90",
       "CWE-95",
+      "CWE-96",
       "CWE-113",
       "CWE-117",
       "CWE-190",
@@ -99,6 +100,29 @@
         46
       ]
     },
+    {
+      "id": "go-template-injection-html",
+      "file": "vulns/go/cwe-96-go.go",
+      "title": "Server-Side Template Injection (SSTI) via html/template with user-controlled input",
+      "category": "go",
+      "language": "go",
+      "cwe": "CWE-96",
+      "cwes": [
+        "CWE-96"
+      ],
+      "severity": "critical",
+      "expected_detection": true,
+      "description": "User input is concatenated into a template string that is parsed",
+      "detection_target": "Taint flow from request input into template.New().Parse()",
+      "safe_guard": "Guarded by the always-false `neverRun` constant plus an `ignore`",
+      "attribution": "line",
+      "vulnerable_lines": [
+        33
+      ],
+      "safe_lines": [
+        40
+      ]
+    },
     {
       "id": "go-integer-overflow",
       "file": "vulns/go/integer-overflow.go",
diff --git a/vulns/go/cwe-96-go.go b/vulns/go/cwe-96-go.go
new file mode 100644
index 0000000..4ea391c
--- /dev/null
+++ b/vulns/go/cwe-96-go.go
@@ -0,0 +1,44 @@
+// @id go-template-injection-html
+// @test-case Server-Side Template Injection (SSTI) via html/template with user-controlled input
+// @cwe CWE-96
+// @severity critical
+// @language go
+// @expected-detection true
+// @description User input is concatenated into a template string that is parsed
+//              and executed by html/template. This allows an attacker to inject
+//              template directives that can access arbitrary data or execute
+//              code, leading to information disclosure or remote code execution.
+//              The html/template package is safe only when templates are static
+//              and user input is passed as data, not as template code.
+// @safe-guard Guarded by the always-false `neverRun` constant plus an `ignore`
+//             build tag; no template is ever parsed or executed.
+// @detection-target Taint flow from request input into template.New().Parse()
+//                   or template.Must(template.New().Parse()) with user-controlled
+//                   template string.
+//
+// NEVER RUN IN PRODUCTION — intentional test case for scanner validation.
+
+//go:build ignore
+
+package vulns
+
+import (
+	"html/template"
+	"net/http"
+)
+
+func renderVulnerable(w http.ResponseWriter, r *http.Request) {
+	if neverRun {
+		userInput := r.URL.Query().Get("template") // SOURCE: attacker-controlled
+		tmpl := template.Must(template.New("page").Parse(userInput)) // VULNERABLE: CWE-96 sink
+		tmpl.Execute(w, nil)
+	}
+}
+
+func renderSafe(w http.ResponseWriter, r *http.Request) {
+	if neverRun {
+		// SAFE: template is static; user input is passed as data, not as template code
+		tmpl := template.Must(template.New("page").Parse("Hello, {{.Name}}!"))
+		tmpl.Execute(w, map[string]string{"Name": r.URL.Query().Get("name")})
+	}
+}
\ No newline at end of file