diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
index 435177e8..8696b5b0 100644
--- a/.github/workflows/build-test-publish.yml
+++ b/.github/workflows/build-test-publish.yml
@@ -41,6 +41,8 @@ jobs:
         include:
           - builder: builder-classic-22
             language: clojure
+          - builder: builder-22
+            language: go
           - builder: builder-22
             language: java
           - builder: builder-22
diff --git a/README.md b/README.md
index d418acc9..a96bb4b6 100644
--- a/README.md
+++ b/README.md
@@ -12,11 +12,11 @@ builders that enable Heroku-like builds with the [`pack`](https://github.com/bui
 | [`heroku/builder:22`][builder-tags]                 | [`heroku/heroku:22-cnb-build`][heroku-tags] | Suggested  |
 | [`heroku/builder-classic:22`][builder-classic-tags] | [`heroku/heroku:22-cnb-build`][heroku-tags] | Available  |
 
-[`heroku/builder`][builder-tags] builder images feature Heroku's native Cloud Native Buildpacks. These buildpacks are optimized and make use of many CNB features.
+[`heroku/builder`][builder-tags] builder images feature Heroku's native Cloud Native Buildpacks. These buildpacks are optimized and make use of many CNB features. These builder images support Go, Java, Node.js, and Typescript codebases.
 
-[`heroku/builder-classic`][builder-classic-tags] builder images feature Heroku's classic platform buildpacks, shimmed for compatibility with the Cloud Native Buildpacks specification. These buildpacks don't take advantage of many CNB features and are less optimized, but offer a wider variety of languages and legacy language feature support.
+[`heroku/builder-classic`][builder-classic-tags] builder images feature Heroku's classic platform buildpacks, shimmed for compatibility with the Cloud Native Buildpacks specification. These buildpacks don't take advantage of many CNB features and are less optimized, but offer a wider variety of languages and legacy language feature support.These builder images support Clojure, Go, Gradle, Java, Node.js, PHP, Python, Ruby, Scala, and Typescript codebases.
 
-[`heroku/buildpacks`][buildpacks-tags] builder images feature a mix of both native and shimmed Heroku Cloud Native Buildpacks. These images will not be supported in future stack versions (22 and beyond).
+[`heroku/buildpacks`][buildpacks-tags] builder images feature a mix of both native and shimmed Heroku Cloud Native Buildpacks. These images will not be supported in future stack versions (22 and beyond). These builder images support Go, Gradle, Java, Node.js, PHP, Python, Ruby, Scala, and Typescript codebases.
 
 ## Usage
 
diff --git a/builder-22/builder.toml b/builder-22/builder.toml
index e26bf5ba..aa1434f0 100644
--- a/builder-22/builder.toml
+++ b/builder-22/builder.toml
@@ -24,6 +24,14 @@ version = "0.14.1"
   id = "heroku/java-function"
   uri = "docker://public.ecr.aws/heroku-buildpacks/heroku-java-function-buildpack@sha256:46e353cadcd941baeb0f566d7ab7b1f13c18e96223c1143dc51b258638ab9d47"
 
+[[buildpacks]]
+  id = "heroku/go"
+  uri = "docker://docker.io/heroku/buildpack-go@sha256:fdc270c4414dc636daf29e269a67f28bb1a8c4aee89974d80b90edbdc10ae8a2"
+
+[[buildpacks]]
+  id = "heroku/procfile"
+  uri = "docker://docker.io/heroku/procfile-cnb:2.0.0"
+
 [[order]]
   [[order.group]]
     id = "heroku/nodejs-function"
@@ -43,3 +51,12 @@ version = "0.14.1"
   [[order.group]]
     id = "heroku/java"
     version = "0.6.5"
+
+[[order]]
+  [[order.group]]
+    id = "heroku/go"
+    version = "0.1.0"
+  [[order.group]]
+    id = "heroku/procfile"
+    version = "2.0.0"
+    optional = true