diff --git a/.github/workflows/buf.yml b/.github/workflows/buf.yml
new file mode 100644
index 000000000..324055fc4
--- /dev/null
+++ b/.github/workflows/buf.yml
@@ -0,0 +1,18 @@
+name: Buf CI
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
+  delete:
+permissions:
+  contents: read
+  pull-requests: write
+jobs:
+  buf:
+    environment: BUF
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: bufbuild/buf-action@v1
+        with:
+          token: ${{ secrets.BUF_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26e2abc31..e5ffad7a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,25 +36,6 @@ jobs:
       - name: Run lint-user-home-dir
         run: just lint-user-home-dir
 
-  proto-lint:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'merge_group' }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Just
-        uses: extractions/setup-just@v3
-        with:
-          just-version: ${{ env.JUST_VERSION }}
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-      - uses: bufbuild/buf-action@v1
-        with:
-          setup_only: true
-      - name: Run proto lint
-        run: just proto::lint
-
   go-vet:
     strategy:
       matrix:
diff --git a/buf.yaml b/buf.yaml
index 2e17c96c1..da955f2b8 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,7 +1,7 @@
 version: v2
 modules:
   - path: proto/tim-api
-    name: buf.build/greylabs/tim-api
+    name: buf.build/settlerlabs/tim-api
 deps:
   - buf.build/googleapis/googleapis
   - buf.build/bufbuild/protovalidate