diff --git a/buf.gen.yaml b/buf.gen.yaml
index 927011f9..45ea4b51 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -1,73 +1,67 @@
-version: v1
+version: v2
 plugins:
   #Document
-  - name: doc
+  - local: protoc-gen-doc
     out: docs
     opt: docs/markdown.tmpl,protos.md
     strategy: all
 
   #Go
-  - name: go
+  - local: protoc-gen-go
     out: pkg
-    opt: 
-      - paths=source_relative
-  - name: go-grpc
+    opt: paths=source_relative
+  - local: protoc-gen-go-grpc
     out: pkg
-    opt:
-      - paths=source_relative
-  - name: go-errors
+    opt: paths=source_relative
+  - local: protoc-gen-go-errors
     out: pkg
-    opt:
-      - paths=source_relative
+    opt: paths=source_relative
 
   #JS
-  - plugin: buf.build/protocolbuffers/js:v3.21.2
+  - remote: buf.build/protocolbuffers/js:v3.21.2
+    out: node
     opt:
       - import_style=commonjs
       - binary
+  - local: node_modules/.bin/grpc_tools_node_protoc_plugin
     out: node
-  - name: js-grpc
-    path: node_modules/.bin/grpc_tools_node_protoc_plugin
     opt: grpc_js
-    out: node
 
   #TS
-  - name: ts
-    path: node_modules/.bin/protoc-gen-ts
-    opt: 
+  - local: node_modules/.bin/protoc-gen-ts
+    out: node
+    opt:
       - mode=grpc-js
       - service=grpc-node
-    out: node
 
   #Rust
-  - plugin: buf.build/community/neoeinstein-prost:v0.3.1
+  - remote: buf.build/community/neoeinstein-prost:v0.3.1
     out: src
     opt:
       - bytes=.
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
       - file_descriptor_set
-  - plugin: buf.build/community/neoeinstein-prost-serde:v0.3.0
+  - remote: buf.build/community/neoeinstein-prost-serde:v0.3.0
     out: src
-  - plugin: buf.build/community/neoeinstein-tonic:v0.4.0
+  - remote: buf.build/community/neoeinstein-tonic:v0.4.0
     out: src
     opt:
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
-  - name: prost-crate
+  - local: protoc-gen-prost-crate
     out: .
+    opt: gen_crate=Cargo.toml
     strategy: all
-    opt:
-      - gen_crate=Cargo.toml
 
   #CSharp
-  - name: csharp
+  - protoc_builtin: csharp
     out: Assets/src
     opt: base_namespace=
-  - plugin: buf.build/grpc/csharp:v1.65.0
+  - remote: buf.build/grpc/csharp:v1.65.0
     out: Assets/src
 
   #Dart
-  - name: dart
+  - local: protoc-gen-dart
     out: lib
-    opt: grpc
\ No newline at end of file
+    opt: grpc
diff --git a/buf.lock b/buf.lock
new file mode 100644
index 00000000..9bf90eca
--- /dev/null
+++ b/buf.lock
@@ -0,0 +1,6 @@
+# Generated by buf. DO NOT EDIT.
+version: v2
+deps:
+  - name: buf.build/bufbuild/protovalidate
+    commit: 3757a25ff0b9479eae89d3e80a508d34
+    digest: b5:b595de493fe51003d0523b5980c5f9710eb2b061b2bbdf73eb5eb572ef8500764186660349cbe491f92476fb66b048f1aca68a1d23856a542834c19e654cea78
diff --git a/buf.work.yaml b/buf.work.yaml
deleted file mode 100644
index 7a18eb02..00000000
--- a/buf.work.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-version: v1
-directories:
-  - proto
\ No newline at end of file
diff --git a/buf.yaml b/buf.yaml
new file mode 100644
index 00000000..817fae27
--- /dev/null
+++ b/buf.yaml
@@ -0,0 +1,21 @@
+version: v2
+modules:
+  - path: proto
+deps:
+  - buf.build/bufbuild/protovalidate
+lint:
+  use:
+    - DEFAULT
+  except:
+    - FIELD_NOT_REQUIRED
+    - PACKAGE_NO_IMPORT_CYCLE
+  ignore_only:
+    PACKAGE_VERSION_SUFFIX:
+      - proto/errors/errors.proto
+  disallow_comment_ignores: true
+breaking:
+  use:
+    - FILE
+  except:
+    - EXTENSION_NO_DELETE
+    - FIELD_SAME_DEFAULT
diff --git a/proto/buf.lock b/proto/buf.lock
deleted file mode 100644
index 3d317f28..00000000
--- a/proto/buf.lock
+++ /dev/null
@@ -1,8 +0,0 @@
-# Generated by buf. DO NOT EDIT.
-version: v1
-deps:
-  - remote: buf.build
-    owner: bufbuild
-    repository: protovalidate
-    commit: 3757a25ff0b9479eae89d3e80a508d34
-    digest: shake256:a22859303872f42a4489bb7d5117aeaa5e36cc6448ae8f317ff29510e04e14282f5426de620602b2ae55fd6c4bc17bd32b18ba8db1cbb7187512ae29275090af
diff --git a/proto/buf.yaml b/proto/buf.yaml
deleted file mode 100644
index ead2efd1..00000000
--- a/proto/buf.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: v1
-deps:
-  - buf.build/bufbuild/protovalidate
-breaking:
-  use:
-    - FILE
-lint:
-  use:
-    - DEFAULT
-  ignore_only:
-    PACKAGE_VERSION_SUFFIX:
-      - errors/errors.proto
\ No newline at end of file