diff --git a/android/build.gradle b/android/build.gradle
index 884e2c04..9821c0c2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -43,20 +43,17 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
+
     lintOptions {
         textOutput "stdout"
         checkAllWarnings true
         warningsAsErrors true
-        disable "UnusedResources"              // Unused will be removed on release
-        disable "IconExpectedSize"             // Using the material icons provided from Google
-        disable "GoogleAppIndexingApiWarning"  // We might want to index our app later
-        disable "InvalidPackage"               // Butterknife, Okio and Realm
-        disable "ResourceType"                 // Annotation binding
-        disable "GradleDependency"
-        disable "NewerVersionAvailable"
-        disable "DuplicatePlatformClasses"      // xpp3 added by azure-identity
-        disable "LambdaLast"
+        lintConfig file("lint.xml")
     }
+
     sourceSets {
         main {
             java.srcDirs = ['../src/main/java']
diff --git a/android/lint-baseline.xml b/android/lint-baseline.xml
new file mode 100644
index 00000000..11149ca5
--- /dev/null
+++ b/android/lint-baseline.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.7.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.2)" variant="all" version="8.7.2">
+
+    <issue
+        id="InvalidPackage"
+        message="Invalid package reference in com.azure:azure-xml; not included in Android: `javax.xml.stream`. Referenced from `com.azure.xml.XmlReader`.">
+        <location
+            file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/com.azure/azure-xml/1.1.0/8218a00c07f9f66d5dc7ae2ba613da6890867497/azure-xml-1.1.0.jar"/>
+    </issue>
+
+</issues>
diff --git a/android/lint.xml b/android/lint.xml
new file mode 100644
index 00000000..0e7a8f71
--- /dev/null
+++ b/android/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="LambdaLast">
+        <ignore path="../src/main/java/com/microsoft/graph/core/requests/GraphClientFactory.java" />
+    </issue>
+</lint>