diff --git a/plugins/protocolbuffers/go/v1.36.11/.dockerignore b/plugins/protocolbuffers/go/v1.36.11/.dockerignore
new file mode 100644
index 000000000..5d0f124ff
--- /dev/null
+++ b/plugins/protocolbuffers/go/v1.36.11/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Dockerfile
diff --git a/plugins/protocolbuffers/go/v1.36.11/Dockerfile b/plugins/protocolbuffers/go/v1.36.11/Dockerfile
new file mode 100644
index 000000000..8dc0c4ee3
--- /dev/null
+++ b/plugins/protocolbuffers/go/v1.36.11/Dockerfile
@@ -0,0 +1,15 @@
+# syntax=docker/dockerfile:1.19
+FROM --platform=$BUILDPLATFORM golang:1.25.5-bookworm AS build
+
+ARG TARGETOS TARGETARCH
+ENV CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH
+
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go install -ldflags "-s -w" -trimpath google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.11 \
+ && mv /go/bin/${GOOS}_${GOARCH}/protoc-gen-go /go/bin/protoc-gen-go || true
+
+FROM scratch
+COPY --from=build --link /etc/passwd /etc/passwd
+COPY --from=build --link --chown=root:root /go/bin/protoc-gen-go .
+USER nobody
+ENTRYPOINT [ "/protoc-gen-go" ]
diff --git a/plugins/protocolbuffers/go/v1.36.11/buf.plugin.yaml b/plugins/protocolbuffers/go/v1.36.11/buf.plugin.yaml
new file mode 100644
index 000000000..93f8015e1
--- /dev/null
+++ b/plugins/protocolbuffers/go/v1.36.11/buf.plugin.yaml
@@ -0,0 +1,20 @@
+version: v1
+name: buf.build/protocolbuffers/go
+plugin_version: v1.36.11
+source_url: https://github.com/protocolbuffers/protobuf-go
+integration_guide_url: https://protobuf.dev/getting-started/gotutorial
+description: Base types for Go. Generates message and enum types.
+output_languages:
+  - go
+registry:
+  go:
+    # https://github.com/protocolbuffers/protobuf-go/blob/v1.36.11/go.mod#L3
+    min_version: "1.23"
+    deps:
+      - module: google.golang.org/protobuf
+        version: v1.36.11
+  opts:
+    - paths=source_relative
+    - default_api_level=API_HYBRID
+spdx_license_id: BSD-3-Clause
+license_url: https://github.com/protocolbuffers/protobuf-go/blob/v1.36.11/LICENSE
diff --git a/tests/testdata/buf.build/protocolbuffers/go/v1.36.11/eliza/plugin.sum b/tests/testdata/buf.build/protocolbuffers/go/v1.36.11/eliza/plugin.sum
new file mode 100644
index 000000000..690dc695e
--- /dev/null
+++ b/tests/testdata/buf.build/protocolbuffers/go/v1.36.11/eliza/plugin.sum
@@ -0,0 +1 @@
+h1:YD4TMvq55Ch/lv9sPdTWi9npzmPYKorijVXraXmHNJM=
diff --git a/tests/testdata/buf.build/protocolbuffers/go/v1.36.11/petapis/plugin.sum b/tests/testdata/buf.build/protocolbuffers/go/v1.36.11/petapis/plugin.sum
new file mode 100644
index 000000000..9f8200d66
--- /dev/null
+++ b/tests/testdata/buf.build/protocolbuffers/go/v1.36.11/petapis/plugin.sum
@@ -0,0 +1 @@
+h1:gKQm40Jj4sBp6wH01Y5Dho3JG/V/dOT67Jm5F0TBPXY=