diff --git a/buf.gen.go.yaml b/buf.gen.go.yaml
index a8cfe174..d05a6035 100644
--- a/buf.gen.go.yaml
+++ b/buf.gen.go.yaml
@@ -1,12 +1,10 @@
-version: v1
+version: v2
 
 plugins:
-  - plugin: buf.build/protocolbuffers/go:v1.31.0
+  - remote: buf.build/protocolbuffers/go:v1.31.0
     out: gen/go
-    opt:
-      - module=github.com/stroeer/go-tapir
+    opt: module=github.com/stroeer/go-tapir
 
-  - plugin: buf.build/grpc/go:v1.3.0
+  - remote: buf.build/grpc/go:v1.3.0
     out: gen/go
-    opt:
-      - module=github.com/stroeer/go-tapir
+    opt: module=github.com/stroeer/go-tapir
diff --git a/buf.gen.node-proto.yaml b/buf.gen.node-proto.yaml
index 2a0cab13..d0e26be9 100644
--- a/buf.gen.node-proto.yaml
+++ b/buf.gen.node-proto.yaml
@@ -1,7 +1,6 @@
-version: v1
+version: v2
 
 plugins:
-  - plugin: buf.build/bufbuild/es:v1.3.1
+  - remote: buf.build/bufbuild/es:v1.3.1
     out: ./node-proto/
-    opt:
-      - target=ts
+    opt: target=ts
diff --git a/buf.gen.node.yaml b/buf.gen.node.yaml
index a4523f87..8216ee8d 100644
--- a/buf.gen.node.yaml
+++ b/buf.gen.node.yaml
@@ -1,19 +1,18 @@
-version: v1
+version: v2
 
 plugins:
   # Typescript/Node
-  - plugin: buf.build/protocolbuffers/js:v3.21.2
+  - remote: buf.build/protocolbuffers/js:v3.21.2
     out: ./node
     opt: import_style=commonjs,binary
 
-  - plugin: buf.build/grpc/node:v1.12.4
+  - remote: buf.build/grpc/node:v1.12.4
     out: ./node
     opt: grpc_js
 
   # TODO: migrate to a remote plugin for Typescript generation
-  - plugin: protoc-gen-ts
+  - local: ./node/node_modules/.bin/protoc-gen-ts
     out: ./node
-    path: ./node/node_modules/.bin/protoc-gen-ts
     opt:
-    - mode=grpc-js
-    - service=grpc-node
+      - mode=grpc-js
+      - service=grpc-node
diff --git a/buf.gen.yaml b/buf.gen.yaml
index 6b7a2280..0081da59 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -1,25 +1,27 @@
-version: v1
+version: v2
 
 managed:
   enabled: true
-  optimize_for: SPEED
-  java_multiple_files: true
-  java_package_prefix:
-    default: de
-    except:
-      - buf.build/googleapis/googleapis
+  disable:
+    - file_option: java_package
+      module: buf.build/googleapis/googleapis
+  override:
+    - file_option: java_multiple_files
+      value: true
+    - file_option: java_package_prefix
+      value: de
+    - file_option: optimize_for
+      value: SPEED
 
 plugins:
   # Java
-  - plugin: buf.build/protocolbuffers/java:v24.4
+  - remote: buf.build/protocolbuffers/java:v24.4
     out: ./java/src/main/java
-
-  - plugin: buf.build/grpc/java:v1.59.0
+  - remote: buf.build/grpc/java:v1.59.0
     out: ./java/src/main/java
 
   # Python
-  - plugin: buf.build/protocolbuffers/python:v24.4
+  - remote: buf.build/protocolbuffers/python:v24.4
     out: gen/python
-
-  - plugin: buf.build/grpc/python:v1.59.2
+  - remote: buf.build/grpc/python:v1.59.2
     out: gen/python
diff --git a/buf.lock b/buf.lock
index c91b5810..4f98143f 100644
--- a/buf.lock
+++ b/buf.lock
@@ -1,2 +1,2 @@
 # Generated by buf. DO NOT EDIT.
-version: v1
+version: v2
diff --git a/buf.yaml b/buf.yaml
index 14908ac1..f4713064 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,20 +1,19 @@
-version: v1
+version: v2
 
-name: buf.build/stroeer/tapir
-
-build:
-  excludes:
-    - node
-    - java
-
-breaking:
-  use:
-    - FILE
+modules:
+  - path: .
+    name: buf.build/stroeer/tapir
+    excludes:
+      - java
+      - node
 
 lint:
   use:
     - DEFAULT
   except:
-    - RPC_RESPONSE_STANDARD_NAME
     - ENUM_VALUE_PREFIX
-  allow_comment_ignores: true
+    - RPC_RESPONSE_STANDARD_NAME
+
+breaking:
+  use:
+    - FILE