diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index b8c744b4..68bd68e3 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -40,13 +40,13 @@ branchProtectionRules:
     - "dependencies (11, java-pubsub)"
     - "flatten-plugin-check"
     - "build (8, java-bigquery, test)"
-    - "build (8, java-bigquery, lint)"
     - "build (8, java-bigquery, clirr)"
     - "build (8, java-bigtable, javadoc)"
     - "build (11, java-bigquery, test)"
-    - "build (11, java-bigquery, lint)"
     - "build (11, java-bigquery, clirr)"
     - "build (11, java-bigtable, javadoc)"
+    - "lint (17, java-bigquery, lint)"
+    - "lint (21, java-bigquery, lint)"
     - "javadoc-with-doclet (java-bigtable)"
     - "cla/google"
     - "graalvm-presubmit-shared-config-a (java-graalvm-ci-prod)"
diff --git a/.github/workflows/downstream-maven-plugins.yaml b/.github/workflows/downstream-maven-plugins.yaml
index 850f42ef..8eef928a 100644
--- a/.github/workflows/downstream-maven-plugins.yaml
+++ b/.github/workflows/downstream-maven-plugins.yaml
@@ -20,7 +20,6 @@ jobs:
         - java-bigtable
         job-type:
         - test  # maven-surefire-plugin
-        - lint  # fmt-maven-plugin and google-java-format
         - clirr # clirr-maven-plugin
         - javadoc # maven-javadoc-plugin
         - javadoc-with-doclet # test javadoc generation with doclet
@@ -34,6 +33,27 @@ jobs:
     - run: sudo apt-get update -y
     - run: sudo apt-get install libxml2-utils
     - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}}
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [17, 21]
+        repo:
+        - java-bigquery
+        - java-bigtable
+        job-type:
+        - lint  # fmt-maven-plugin and google-java-format
+    steps:
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: zulu
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: sudo apt-get update -y
+    - run: sudo apt-get install libxml2-utils
+    - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}}
   javadoc-with-doclet:
     runs-on: ubuntu-latest
     strategy:
diff --git a/.kokoro/client-library-check.sh b/.kokoro/client-library-check.sh
index e68e8043..425cdb45 100755
--- a/.kokoro/client-library-check.sh
+++ b/.kokoro/client-library-check.sh
@@ -155,6 +155,10 @@ flatten-plugin)
     popd
     ;;
 *)
+    # Here we replace the com.coveo fmt plugin with the spotify version.
+	# This `sed` won't be needed once downstream repositories update
+	# `.kokoro/build.sh` to use the `com.spotify.fmt` group ID.
+    sed -i 's/com.coveo:fmt-maven-plugin/com.spotify.fmt:fmt-maven-plugin/' .kokoro/build.sh
     # This reads the JOB_TYPE environmental variable
     .kokoro/build.sh
     RETURN_CODE=$?
diff --git a/.kokoro/presubmit/downstream-build.sh b/.kokoro/presubmit/downstream-build.sh
index 3ca932fc..9986c14c 100755
--- a/.kokoro/presubmit/downstream-build.sh
+++ b/.kokoro/presubmit/downstream-build.sh
@@ -42,14 +42,14 @@ cp settings.xml "${HOME}/.m2"
 git clone "https://github.com/googleapis/sdk-platform-java" --depth=1
 
 # Update the shared-config version in showcase
-pushd sdk-platform-java/showcase
+pushd sdk-platform-java/java-showcase
 modify_shared_config
 popd
 
 pushd sdk-platform-java
 mvn -B -ntp install --projects '!gapic-generator-java' -Dcheckstyle.skip -Dfmt.skip -DskipTests
 popd
-pushd sdk-platform-java/showcase/gapic-showcase
+pushd sdk-platform-java/java-showcase/gapic-showcase
 SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)
 popd
 
@@ -62,7 +62,7 @@ tar -xf showcase-*
 popd
 
 # Run showcase tests with `native` profile
-pushd sdk-platform-java/showcase
+pushd sdk-platform-java/java-showcase
 mvn test -Pnative,-showcase -Denforcer.skip=true -ntp -B
 popd
 
diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml
index fa4cd376..c27be308 100644
--- a/java-shared-config/pom.xml
+++ b/java-shared-config/pom.xml
@@ -28,7 +28,7 @@
     <skipITs>true</skipITs>
     <auto-value.version>1.11.0</auto-value.version>
     <docRoot>/java/docs/reference/</docRoot>
-    <google-java-format.version>1.7</google-java-format.version>
+    <google-java-format.version>1.25.2</google-java-format.version>
   </properties>
 
   <build>
@@ -169,9 +169,9 @@
           <version>2.8</version>
         </plugin>
         <plugin>
-          <groupId>com.coveo</groupId>
+          <groupId>com.spotify.fmt</groupId>
           <artifactId>fmt-maven-plugin</artifactId>
-          <version>2.9</version>
+          <version>2.25</version>
           <configuration>
             <style>google</style>
             <verbose>true</verbose>