diff --git a/.github/workflows/buf-push.yml b/.github/workflows/buf-push.yml
index 9cbc657fc47e..a7a66cdf3124 100644
--- a/.github/workflows/buf-push.yml
+++ b/.github/workflows/buf-push.yml
@@ -15,8 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.31.0
-      - uses: bufbuild/buf-push-action@v1
+      - uses: bufbuild/buf-action@v1
         with:
           input: "proto"
-          buf_token: ${{ secrets.BUF_TOKEN }}
+          token: ${{ secrets.BUF_TOKEN }}
+          version: 1.35.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 924f46bc6a6a..f63cf7f71e8d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -129,21 +129,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: bufbuild/buf-setup-action@v1.31.0
-        with:
-          github_token: ${{ github.token }}
-      - uses: bufbuild/buf-lint-action@v1
+      - uses: bufbuild/buf-action@v1
         with:
           input: "proto"
+          pr_comment: false
+          version: 1.35.0
   check_generated_protobuf:
     name: Up-to-date protobuf
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-go-for-project
-      - uses: bufbuild/buf-setup-action@v1.31.0
+      - uses: bufbuild/buf-action@v1
         with:
-          github_token: ${{ github.token }}
+          setup_only: true
+          version: 1.35.0
       - shell: bash
         run: scripts/protobuf_codegen.sh
       - shell: bash
diff --git a/scripts/protobuf_codegen.sh b/scripts/protobuf_codegen.sh
index d57868924906..204f301ef595 100755
--- a/scripts/protobuf_codegen.sh
+++ b/scripts/protobuf_codegen.sh
@@ -8,7 +8,7 @@ if ! [[ "$0" =~ scripts/protobuf_codegen.sh ]]; then
 fi
 
 ## ensure the correct version of "buf" is installed
-BUF_VERSION='1.31.0'
+BUF_VERSION='1.35.0'
 if [[ $(buf --version | cut -f2 -d' ') != "${BUF_VERSION}" ]]; then
   echo "could not find buf ${BUF_VERSION}, is it installed + in PATH?"
   exit 255