diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2425d723..43a2e943 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,86 +1,92 @@
-on:
+'on':
   push:
     branches:
-    - main
-  pull_request:
+      - 2.4.x
+  pull_request: null
 name: ci
 jobs:
   units:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java:
+          - 8
+          - 11
+          - 17
     steps:
-    - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
-    - uses: actions/setup-java@v2
-      with:
-        distribution: zulu
-        java-version: ${{matrix.java}}
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: test
+      - uses: actions/checkout@v2
+      - uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.8.1
+      - uses: actions/setup-java@v2
+        with:
+          distribution: zulu
+          java-version: ${{matrix.java}}
+      - run: java -version
+      - run: .kokoro/build.sh
+        env:
+          JOB_TYPE: test
   windows:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
-    - uses: actions/setup-java@v2
-      with:
-        distribution: zulu
-        java-version: 8
-    - run: java -version
-    - run: .kokoro/build.bat
-      env:
-        JOB_TYPE: test
+      - uses: actions/checkout@v2
+      - uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.8.1
+      - uses: actions/setup-java@v2
+        with:
+          distribution: zulu
+          java-version: 8
+      - run: java -version
+      - run: .kokoro/build.bat
+        env:
+          JOB_TYPE: test
   dependencies:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java:
+          - 8
+          - 11
+          - 17
     steps:
-    - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
-    - uses: actions/setup-java@v2
-      with:
-        distribution: zulu
-        java-version: ${{matrix.java}}
-    - run: java -version
-    - run: .kokoro/dependencies.sh
+      - uses: actions/checkout@v2
+      - uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.8.1
+      - uses: actions/setup-java@v2
+        with:
+          distribution: zulu
+          java-version: ${{matrix.java}}
+      - run: java -version
+      - run: .kokoro/dependencies.sh
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
-    - uses: actions/setup-java@v2
-      with:
-        distribution: zulu
-        java-version: 8
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: lint
+      - uses: actions/checkout@v2
+      - uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.8.1
+      - uses: actions/setup-java@v2
+        with:
+          distribution: zulu
+          java-version: 8
+      - run: java -version
+      - run: .kokoro/build.sh
+        env:
+          JOB_TYPE: lint
   clirr:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: stCarolas/setup-maven@v4
-      with:
-        maven-version: 3.8.1
-    - uses: actions/setup-java@v2
-      with:
-        distribution: zulu
-        java-version: 8
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: clirr
+      - uses: actions/checkout@v2
+      - uses: stCarolas/setup-maven@v4
+        with:
+          maven-version: 3.8.1
+      - uses: actions/setup-java@v2
+        with:
+          distribution: zulu
+          java-version: 8
+      - run: java -version
+      - run: .kokoro/build.sh
+        env:
+          JOB_TYPE: clirr
diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml
index 0f1bc811..b94477d7 100644
--- a/.github/workflows/downstream.yaml
+++ b/.github/workflows/downstream.yaml
@@ -1,8 +1,8 @@
-on:
+'on':
   push:
     branches:
-      - main
-  pull_request:
+      - 2.4.x
+  pull_request: null
 name: downstream
 jobs:
   dependencies:
@@ -10,7 +10,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11]
+        java:
+          - 8
+          - 11
         repo:
           - java-bigquery
           - java-bigqueryconnection
diff --git a/.github/workflows/upper-bound-check.yaml b/.github/workflows/upper-bound-check.yaml
index 45cb8b9d..d62edcf7 100644
--- a/.github/workflows/upper-bound-check.yaml
+++ b/.github/workflows/upper-bound-check.yaml
@@ -1,8 +1,8 @@
-on:
+'on':
   push:
     branches:
-      - main
-  pull_request:
+      - 2.4.x
+  pull_request: null
 name: upper-bound-check
 jobs:
   upper-bound-check:
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9a5105d7..240e0747 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -37,16 +37,13 @@ function determineMavenOpts() {
       | sed -E 's/^.*"(.*?)".*$/\1/g' \
       | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
   )
-
-  case $javaVersion in
-    "17")
+  if [[ $javaVersion == 17* ]]
+    then
       # MaxPermSize is no longer supported as of jdk 17
       echo -n "-Xmx1024m"
-      ;;
-    *)
+  else
       echo -n "-Xmx1024m -XX:MaxPermSize=128m"
-      ;;
-  esac
+  fi
 }
 
 export MAVEN_OPTS=$(determineMavenOpts)
diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml
index dd9e651e..f37aee20 100644
--- a/first-party-dependencies/pom.xml
+++ b/first-party-dependencies/pom.xml
@@ -63,7 +63,7 @@
     <google.api-common.version>2.0.5</google.api-common.version>
     <google.common-protos.version>2.6.0</google.common-protos.version>
     <google.core.version>2.2.0</google.core.version>
-    <google.auth.version>1.2.1</google.auth.version>
+    <google.auth.version>1.2.2</google.auth.version>
     <google.http-client.version>1.40.1</google.http-client.version>
     <google.oauth-client.version>1.32.1</google.oauth-client.version>
     <google.api-client.version>1.32.2</google.api-client.version>