diff --git a/.github/workflows/proto-push.yml b/.github/workflows/proto-push.yml
new file mode 100644
index 0000000000..b1d8444165
--- /dev/null
+++ b/.github/workflows/proto-push.yml
@@ -0,0 +1,30 @@
+name: Proto Push
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  proto-push:
+    name: "Push Protos"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: bufbuild/buf-setup-action@v1.26.0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: bufbuild/buf-lint-action@v1
+        with:
+          input: "rpc/flipt"
+
+      - uses: bufbuild/buf-breaking-action@v1
+        with:
+          input: "rpc/flipt"
+          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main"
+
+      - uses: bufbuild/buf-push-action@v1
+        with:
+          input: "rpc/flipt"
+          buf_token: ${{ secrets.BUF_TOKEN }}
diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
index 09f3968c2f..cc1d978200 100644
--- a/.github/workflows/proto.yml
+++ b/.github/workflows/proto.yml
@@ -13,14 +13,13 @@ on:
 
 jobs:
   proto-lint:
-    name: "Lint Proto"
+    name: "Lint Protos"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 
-      - uses: bufbuild/buf-setup-action@v1.7.0
+      - uses: bufbuild/buf-setup-action@v1.26.0
         with:
-          version: "latest"
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: bufbuild/buf-lint-action@v1
@@ -33,7 +32,7 @@ jobs:
           against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main"
 
   proto-check:
-    name: "Proto Check"
+    name: "Check Generated Code"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -44,9 +43,8 @@ jobs:
           check-latest: true
           cache: true
 
-      - uses: bufbuild/buf-setup-action@v1.7.0
+      - uses: bufbuild/buf-setup-action@v1.26.0
         with:
-          version: "latest"
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: magefile/mage-action@v2
diff --git a/buf.public.gen.yaml b/buf.public.gen.yaml
deleted file mode 100644
index 2ea220d6c4..0000000000
--- a/buf.public.gen.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: v1
-plugins:
-  - name: go
-    out: ../flipt-grpc-go
-    opt:
-      - paths=source_relative
-  - name: go-grpc
-    out: ../flipt-grpc-go
-    opt:
-      - paths=source_relative
-  - remote: buf.build/protocolbuffers/plugins/ruby:v3.19.1-1
-    out: ../flipt-grpc-ruby/lib
-  - remote: buf.build/grpc/plugins/ruby:v1.41.1-1
-    out: ../flipt-grpc-ruby/lib
diff --git a/rpc/flipt/buf.lock b/rpc/flipt/buf.lock
index d8efa9a963..b3e463b23c 100644
--- a/rpc/flipt/buf.lock
+++ b/rpc/flipt/buf.lock
@@ -4,8 +4,8 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 75b4300737fb4efca0831636be94e517
+    commit: 711e289f6a384c4caeebaff7c6931ade
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway
-    commit: a1ecdc58eccd49aa8bea2a7a9022dc27
+    commit: fed2dcdcfd694403ad51cd3c94957830
diff --git a/rpc/flipt/buf.yaml b/rpc/flipt/buf.yaml
index cd225ba547..154a6677bc 100644
--- a/rpc/flipt/buf.yaml
+++ b/rpc/flipt/buf.yaml
@@ -1,5 +1,5 @@
 version: v1
-name: buf.build/markphelps/flipt
+name: buf.build/flipt-io/flipt
 deps:
   - buf.build/googleapis/googleapis
   - buf.build/grpc-ecosystem/grpc-gateway