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/java-gsuite-addons/.OwlBot-hermetic.yaml b/java-gsuite-addons/.OwlBot-hermetic.yaml
index ea7940af5140..52d40e13619f 100644
--- a/java-gsuite-addons/.OwlBot-hermetic.yaml
+++ b/java-gsuite-addons/.OwlBot-hermetic.yaml
@@ -30,19 +30,19 @@ deep-copy-regex:
 - source: "/google/cloud/gsuiteaddons/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/java-gsuite-addons/$1/google-cloud-gsuite-addons/src"
 - source: "/google/apps/script/type/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gsuite-addons/v1/proto-google-apps-script-type-protos/src"
+  dest: "/owl-bot-staging/java-gsuite-addons/type/proto-google-apps-script-type-protos/src"
 - source: "/google/apps/script/type/calendar/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gsuite-addons/v1/proto-google-apps-script-type-protos/src"
+  dest: "/owl-bot-staging/java-gsuite-addons/calendar/proto-google-apps-script-type-protos/src"
 - source: "/google/apps/script/type/docs/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gsuite-addons/v1/proto-google-apps-script-type-protos/src"
+  dest: "/owl-bot-staging/java-gsuite-addons/docs/proto-google-apps-script-type-protos/src"
 - source: "/google/apps/script/type/drive/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gsuite-addons/v1/proto-google-apps-script-type-protos/src"
+  dest: "/owl-bot-staging/java-gsuite-addons/drive/proto-google-apps-script-type-protos/src"
 - source: "/google/apps/script/type/gmail/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gsuite-addons/v1/proto-google-apps-script-type-protos/src"
+  dest: "/owl-bot-staging/java-gsuite-addons/gmail/proto-google-apps-script-type-protos/src"
 - source: "/google/apps/script/type/sheets/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gsuite-addons/v1/proto-google-apps-script-type-protos/src"
+  dest: "/owl-bot-staging/java-gsuite-addons/sheets/proto-google-apps-script-type-protos/src"
 - source: "/google/apps/script/type/slides/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gsuite-addons/v1/proto-google-apps-script-type-protos/src"
+  dest: "/owl-bot-staging/java-gsuite-addons/slides/proto-google-apps-script-type-protos/src"
 - source: "/google/cloud/gsuiteaddons/(v.*)/.*-java/samples/snippets/generated"
   dest: "/owl-bot-staging/java-gsuite-addons/$1/samples/snippets/generated"