diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
deleted file mode 100644
index 5d9a9d8b5..000000000
--- a/.github/.OwlBot.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-docker:
-  image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
diff --git a/owlbot.py b/owlbot.py
index 610e82700..8bf9d155d 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -36,6 +36,7 @@
         ".kokoro/nightly/integration.cfg",
         ".kokoro/presubmit/integration.cfg",
         ".kokoro/presubmit/graalvm-native.cfg",
-        ".kokoro/presubmit/graalvm-native-17.cfg"
+        ".kokoro/presubmit/graalvm-native-17.cfg",
+        "oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java"
     ]
 )
diff --git a/pom.xml b/pom.xml
index ba2e00312..45fce5aa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,6 +214,7 @@
           <version>2.13</version>
           <configuration>
             <verbose>true</verbose>
+            <skipSortingImports>true</skipSortingImports>
           </configuration>
         </plugin>
         <plugin>
@@ -268,6 +269,7 @@
               <testSourceDirectories>
                 <testSourceDirectory>src/test</testSourceDirectory>
               </testSourceDirectories>
+              <excludes>com.google.auth.oauth2.ExternalAccountCredentials</excludes>
             </configuration>
           </execution>
         </executions>