diff --git a/docs/reference/supported-languages.njk b/docs/reference/supported-languages.njk
index 62b1e7bb1..e005133ca 100644
--- a/docs/reference/supported-languages.njk
+++ b/docs/reference/supported-languages.njk
@@ -8,7 +8,7 @@ supportChart:
       - Ruby on Rails
     rules: true
     searchName: lang-ruby
-    searchTerm: ruby
+    searchTerm: ruby_
     status: GA
   javascript:
     name: JavaScript / TypeScript
@@ -17,7 +17,7 @@ supportChart:
       - React
     rules: true
     searchName: lang-jsts
-    searchTerm: javascript
+    searchTerm: javascript_
     status: GA
   java:
     name: Java
@@ -37,11 +37,12 @@ supportChart:
     status: Beta
   go:
     name: Go
-    frameworks: []
+    frameworks:
+      - Gorilla
     rules: true
     searchName: lang-go
     searchTerm: go_
-    status: Alpha
+    status: Beta
   python:
     name: Python
     frameworks: []
diff --git a/kpi_scan/kpi_repo_list.json5 b/kpi_scan/kpi_repo_list.json5
index 89676c786..51df03503 100644
--- a/kpi_scan/kpi_repo_list.json5
+++ b/kpi_scan/kpi_repo_list.json5
@@ -31,6 +31,9 @@
     // php
     { "name": "OWASPWebGoatPHP", "repository_url": "https://github.com/OWASP/OWASPWebGoatPHP" },
     { "name": "Vulnerable-Web-Application", "repository_url": "https://github.com/OWASP/Vulnerable-Web-Application" },
-    { "name": "mediawiki", "repository_url": "https://github.com/wikimedia/mediawiki" }
+    { "name": "mediawiki", "repository_url": "https://github.com/wikimedia/mediawiki" },
+    // golang
+    { "name": "Vulnerability-goapp", "repository_url": "https://github.com/Hardw01f/Vulnerability-goapp" },
+    { "name": "govwa", "repository_url": "https://github.com/0c34/govwa" }
   ]
 }