diff --git a/.github/workflows/update_generation_config.yaml b/.github/workflows/update_generation_config.yaml
index a7e14bb48..8de9d67ea 100644
--- a/.github/workflows/update_generation_config.yaml
+++ b/.github/workflows/update_generation_config.yaml
@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - name: Install Dependencies
       shell: bash
       run: sudo apt-get update && sudo apt-get install -y libxml2-utils
@@ -43,5 +43,5 @@ jobs:
           --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
 
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index c16aa11c6..3b75aba9e 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -103,6 +103,7 @@ samples)
         pushd ${SAMPLES_DIR}
         mvn -B \
           -ntp \
+          -Dprotobuf.version=4.29.4 \
           -DtrimStackTrace=false \
           -Dclirr.skip=true \
           -Denforcer.skip=true \