diff --git a/Makefile b/Makefile
index d43b05677..f6fcf899d 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ api-linter-install:
 
 buf-install:
 	printf $(COLOR) "Install/update buf..."
-	go install github.com/bufbuild/buf/cmd/buf@v1.27.0
+	go install github.com/bufbuild/buf/cmd/buf@v1.49.0
 
 ##### Sync external proto dependencies #####
 sync-nexus-annotations:
@@ -112,12 +112,12 @@ api-linter:
 $(STAMPDIR):
 	mkdir $@
 
-$(STAMPDIR)/buf-mod-prune: $(STAMPDIR) buf.yaml
+$(STAMPDIR)/buf-dep-prune: $(STAMPDIR) buf.yaml
 	printf $(COLOR) "Pruning buf module"
-	buf mod prune
+	buf dep prune
 	touch $@
 
-buf-lint: $(STAMPDIR)/buf-mod-prune
+buf-lint: $(STAMPDIR)/buf-dep-prune
 	printf $(COLOR) "Run buf linter..."
 	(cd $(PROTO_ROOT) && buf lint)
 
diff --git a/buf.gen.yaml b/buf.gen.yaml
deleted file mode 100644
index 555cd008d..000000000
--- a/buf.gen.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: v1
-plugins:
-  - plugin: buf.build/protocolbuffers/go:v1.31.0
-    out: ./
-    opt:
-      - paths=source_relative
-  - plugin: buf.build/grpc/go:v1.3.0
-    out: ./
-    opt:
-      - paths=source_relative
-  - plugin: buf.build/grpc-ecosystem/gateway:v2.18.0
-    out: ./
-    opt:
-      - paths=source_relative
-      - allow_patch_feature=false
-  - name: go-helpers
-    out: ./
-    path: ["go", "run", "./protoc-gen-go-helpers"]
-    opt:
-      - paths=source_relative
diff --git a/buf.lock b/buf.lock
index f43352bf2..e0559987a 100644
--- a/buf.lock
+++ b/buf.lock
@@ -1,18 +1,9 @@
 # Generated by buf. DO NOT EDIT.
-version: v1
+version: v2
 deps:
-  - remote: buf.build
-    owner: googleapis
-    repository: googleapis
+  - name: buf.build/googleapis/googleapis
     commit: 004180b77378443887d3b55cabc00384
-    digest: shake256:d26c7c2fd95f0873761af33ca4a0c0d92c8577122b6feb74eb3b0a57ebe47a98ab24a209a0e91945ac4c77204e9da0c2de0020b2cedc27bdbcdea6c431eec69b
-  - remote: buf.build
-    owner: grpc-ecosystem
-    repository: grpc-gateway
-    commit: 6467306b4f624747aaf6266762ee7a1c
-    digest: shake256:833d648b99b9d2c18b6882ef41aaeb113e76fc38de20dda810c588d133846e6593b4da71b388bcd921b1c7ab41c7acf8f106663d7301ae9e82ceab22cf64b1b7
-  - remote: buf.build
-    owner: temporalio
-    repository: nexus-annotations
+    digest: b5:e8f475fe3330f31f5fd86ac689093bcd274e19611a09db91f41d637cb9197881ce89882b94d13a58738e53c91c6e4bae7dc1feba85f590164c975a89e25115dc
+  - name: buf.build/temporalio/nexus-annotations
     commit: 599b78404fbe4e78b833d527a1d0da40
-    digest: shake256:1f41ef11ccbf31d7318b0fe1915550ba6567c99dc94694d60b117fc1ffc756290ba9766c58b403986f079e2b861b42538e5f8cf0495f744cd390d223b81854ca
+    digest: b5:feb0298a2e7e60058a5dee533e166e152bd0c3b9f776170946fba80737722022a39a65b132af1028d150d2c5bc52990694f60fbcf89fbb9693f7a6b7803d9203
diff --git a/buf.yaml b/buf.yaml
index 2f2fa5389..d00ec17a7 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,24 +1,23 @@
-version: v1
-name: buf.build/temporalio/api
+version: v2
+modules:
+  - path: .
+    name: buf.build/temporalio/api
+    excludes:
+      # Vendored for api-linter (can't read the BSR); excluded so buf sees them once.
+      - google
+      - nexusannotations
 deps:
-  - buf.build/grpc-ecosystem/grpc-gateway
   - buf.build/googleapis/googleapis
   - buf.build/temporalio/nexus-annotations
-build:
-  excludes:
-    # Buf won't accept a local dependency on the google protos but we need them
-    # to run api-linter, so just tell buf it ignore it
-    - google
-    # Same for nexusannotations - local copy for api-linter, BSR dep for buf
-    - nexusannotations
-breaking:
+lint:
   use:
-    - WIRE_JSON
+    - STANDARD
   ignore:
+    - cmd
     - google
-lint:
+  disallow_comment_ignores: true
+breaking:
   use:
-    - DEFAULT
+    - WIRE_JSON
   ignore:
     - google
-    - cmd