diff --git a/.gitignore b/.gitignore
index 27b9f76..a4a8eb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ models/
 /out
 
 /redmage
+gen/
diff --git a/Makefile b/Makefile
index 5e961d9..730e0f3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,11 @@ export REDMAGE_RUNTIME_VERSION=$(shell echo "$${REDMAGE_RUNTIME_VERSION:-unknown
 
 export GCO_ENABLED=0
 
+generate:
+	rm -rf ./gen/grpc
+	cd proto
+	buf generate
+
 start: dev-dependencies web-dependencies migrate-up
 	REDMAGE_RUNTIME_VERSION=$(shell git describe --tags --abbrev=0) air
 
diff --git a/flake.lock b/flake.lock
index 975e82f..3e5c4d0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694102001,
-        "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712192574,
-        "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=",
+        "lastModified": 1722415718,
+        "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f480f9d09e4b4cf87ee6151eba068197125714de",
+        "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1712437997,
-        "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
+        "lastModified": 1710565619,
+        "narHash": "sha256-xu/EnZCNdIj7m/QjCNIG5vrCA4TYg5uwFReb9XDxET0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
+        "rev": "8ac30a39abc5ea67037dfbf090d6e89f187c6e50",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703164129,
-        "narHash": "sha256-kCcCqqwvjN07H8FPG4tXsRVRcMqT8dUNt9pwW1kKAe8=",
+        "lastModified": 1709043057,
+        "narHash": "sha256-F/u9u1vevCUqgCz0WjcCOPcN+h9kLEP73nBqie86J2w=",
         "owner": "joerdav",
         "repo": "xc",
-        "rev": "0655cccfcf036556aeaddfb8f45dc7e8dd1b3680",
+        "rev": "52cfa7e7f2d5a0d97b45a6f69ff1403a901e78c6",
         "type": "github"
       },
       "original": {
diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml
index 4534642..7ae5e0f 100644
--- a/proto/buf.gen.yaml
+++ b/proto/buf.gen.yaml
@@ -1,9 +1,8 @@
-version: v1
-name: buf.build/tigor/redmage
+version: v2
 plugins:
-  - plugin: go
+  - local: protoc-gen-go
     out: ../gen/grpc
     opt: paths=source_relative
-  - plugin: go-grpc
+  - local: protoc-gen-connect-go
     out: ../gen/grpc
     opt: paths=source_relative
diff --git a/proto/buf.yaml b/proto/buf.yaml
new file mode 100644
index 0000000..b4d4e47
--- /dev/null
+++ b/proto/buf.yaml
@@ -0,0 +1 @@
+version: v2
diff --git a/proto/redmage.proto b/proto/redmage/redmage.proto
similarity index 100%
rename from proto/redmage.proto
rename to proto/redmage/redmage.proto