diff --git a/gapic-libraries-bom/pom.xml b/gapic-libraries-bom/pom.xml
index 9f1174f95b72..9cbef9e2cdee 100644
--- a/gapic-libraries-bom/pom.xml
+++ b/gapic-libraries-bom/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>gapic-libraries-bom</artifactId>
   <packaging>pom</packaging>
-  <version>1.85.1</version><!-- {x-version-update:google-cloud-java:current} -->
+  <version>1.85.0</version><!-- {x-version-update:google-cloud-java:current} -->
   <name>Google Cloud Java BOM</name>
   <description>
     BOM for the libraries in google-cloud-java repository. Users should not
diff --git a/sdk-platform-java/.cloudbuild/library_generation/cloudbuild-library-generation-integration-test.yaml b/sdk-platform-java/.cloudbuild/library_generation/cloudbuild-library-generation-integration-test.yaml
index e39cfbf1a3fa..3bfe19506e1d 100644
--- a/sdk-platform-java/.cloudbuild/library_generation/cloudbuild-library-generation-integration-test.yaml
+++ b/sdk-platform-java/.cloudbuild/library_generation/cloudbuild-library-generation-integration-test.yaml
@@ -23,7 +23,7 @@ steps:
       # Use a fixed protoc version so that the generation result stays the same
       "--build-arg", "PROTOC_VERSION=25.8",
       "-t", "${_TEST_IMAGE}",
-      "-f", ".cloudbuild/library_generation/library_generation_airlock.Dockerfile",
+      "-f", "sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile",
       "."
   ]
   id: build-image
@@ -82,7 +82,7 @@ steps:
     "run",
     "--rm",
     "-v", "/workspace/google-cloud-java:/workspace",
-    "-v", "/workspace/hermetic_build/library_generation/tests/resources/integration/google-cloud-java:/workspace/config",
+    "-v", "/workspace/sdk-platform-java/hermetic_build/library_generation/tests/resources/integration/google-cloud-java:/workspace/config",
     "-v", "/workspace/googleapis:/workspace/apis",
     # Fix gapic-generator-java so that the generation result stays
     # the same.
@@ -110,7 +110,7 @@ steps:
     source .venv/bin/activate
     pip install --require-hashes -r requirements.txt
     python -m unittest integration_tests.py
-  dir: ".cloudbuild/library_generation/scripts"
+  dir: "sdk-platform-java/.cloudbuild/library_generation/scripts"
   id: verify-generation
   waitFor: ["generate-libraries"]
 options:
diff --git a/sdk-platform-java/.cloudbuild/library_generation/cloudbuild-library-generation-push-exitgate.yaml b/sdk-platform-java/.cloudbuild/library_generation/cloudbuild-library-generation-push-exitgate.yaml
index 3a3497c9ce74..d96f1dd99fef 100644
--- a/sdk-platform-java/.cloudbuild/library_generation/cloudbuild-library-generation-push-exitgate.yaml
+++ b/sdk-platform-java/.cloudbuild/library_generation/cloudbuild-library-generation-push-exitgate.yaml
@@ -25,7 +25,7 @@ steps:
       "build",
       "-t", "${_SHA_IMAGE_ID}",
       "-t", "${_VERSIONED_IMAGE_ID}",
-      "-f", ".cloudbuild/library_generation/library_generation_airlock.Dockerfile",
+      "-f", "sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile",
       "."
     ]
     id: library-generation-build
diff --git a/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile b/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile
index 347692a18fe9..dd805ecfc362 100644
--- a/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile
+++ b/sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -33,7 +33,7 @@ RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https
 # Compile and install packages
 RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip -pl sdk-platform-java/gapic-generator-java --also-make
 RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
-  "./gapic-generator-java.jar"
+  "/gapic-generator-java.jar"
 
 FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
 
@@ -94,7 +94,7 @@ ENV JAVA_FORMATTER_LOCATION="${HOME}/.library_generation/google-java-format.jar"
 # Note that the destination is a well-known location that will be assumed at runtime
 # We hard-code the location string to avoid making it configurable (via ARG) as
 # well as to avoid it making it overridable at runtime (via ENV).
-COPY --from=ggj-build "/google-cloud-java/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
+COPY --from=ggj-build "/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
 RUN chmod 755 "${HOME}/.library_generation/gapic-generator-java.jar"
 ENV GAPIC_GENERATOR_LOCATION="${HOME}/.library_generation/gapic-generator-java.jar"
 
diff --git a/sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
index a98aef8d3564..9c8dadb387f2 100644
--- a/sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
+++ b/sdk-platform-java/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
@@ -18,21 +18,22 @@
 # 3.9.9-eclipse-temurin-11-alpine
 FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f04985c6a68415e36c0a6468d0f8316f27d4dbee77bc459257ba444224bd9f AS ggj-build
 
-WORKDIR /sdk-platform-java
-COPY sdk-platform-java/ .
+WORKDIR /google-cloud-java
+
+COPY . .
 # {x-version-update-start:gapic-generator-java:current}
 ENV DOCKER_GAPIC_GENERATOR_VERSION="2.71.0"
 # {x-version-update-end}
 
 # Download the java formatter
-RUN mvn -pl gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version
+RUN mvn -pl sdk-platform-java/gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version
 RUN cat /java-formatter-version
 RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${V}/google-java-format-${V}-all-deps.jar"
 
 # Skipping the fmt check until 3.9.9-eclipse-temurin-17-alpine:969014ee8852 is available in Airlock.
-RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
+RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip -pl sdk-platform-java/gapic-generator-java --also-make
 RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
-  "./gapic-generator-java.jar"
+  "/gapic-generator-java.jar"
 
 # 3.12.3-slim-bookworm
 FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
@@ -94,7 +95,7 @@ ENV JAVA_FORMATTER_LOCATION="${HOME}/.library_generation/google-java-format.jar"
 # Note that the destination is a well-known location that will be assumed at runtime
 # We hard-code the location string to avoid making it configurable (via ARG) as
 # well as to avoid it making it overridable at runtime (via ENV).
-COPY --from=ggj-build "/sdk-platform-java/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
+COPY --from=ggj-build "/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar"
 RUN chmod 755 "${HOME}/.library_generation/gapic-generator-java.jar"
 ENV GAPIC_GENERATOR_LOCATION="${HOME}/.library_generation/gapic-generator-java.jar"