diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c4d1cff5b..bbe15182b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -37,17 +37,6 @@ android {
   }
 
   namespace = "app.passwordstore"
-
-  lint {
-    abortOnError = true
-    checkReleaseBuilds = false
-    warningsAsErrors = true
-    disable.add("MissingTranslation")
-    disable.add("PluralsCandidate")
-    disable.add("ImpliedQuantity")
-    disable.add("DialogFragmentCallbacksDetector")
-    baseline = file("lint-baseline.xml")
-  }
 }
 
 dependencies {
diff --git a/app/lint.xml b/app/lint.xml
index 4f3fbe6cb..af4a7b2c9 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -26,5 +26,22 @@
   <issue id="UnusedResources">
     <ignore path="src/main/res/values/bools.xml" />
     <ignore path="src/main/res/values/colors_material3.xml" />
+    <ignore path="src/main/res/layout/map_preference_widget_switch.xml" />
   </issue>
+  <issue id="PrivateResource">
+    <ignore path="src/main/res/layout/map_preference_widget_switch.xml" />
+  </issue>
+  <issue id="Deprecated">
+    <ignore path="src/main/res/layout/item_field.xml" />
+  </issue>
+  <issue id="VectorPath">
+    <ignore path="src/main/res/drawable/app_settings_alt_24px.xml" />
+    <ignore path="src/main/res/drawable/ic_launcher_foreground_monochrome.xml" />
+    <ignore path="src/main/res/drawable/ic_miscellaneous_services_24px.xml" />
+    <ignore path="src/main/res/drawable/ic_miscellaneous_services_24px.xml" />
+  </issue>
+  <issue id="GradleDependency" severity="ignore" />
+  <issue id="ReportShortcutUsage" severity="ignore" />
+  <issue id="MissingTranslation" severity="ignore" />
+  <issue id="ImpliedQuantity" severity="ignore" />
 </lint>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 67ae17992..48c6af6e8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,5 @@
 [versions]
 agp = "7.4.2"
-# 1.8.x is being built against current DP releases
-# noinspection GradleDependency
 androidxActivity = "1.7.0-beta02"
 bouncycastle = "1.72"
 # @keep used for kotlinCompilerExtensionVersion
@@ -14,8 +12,6 @@ leakcanary = "2.10"
 lifecycle = "2.6.0-rc01"
 
 [libraries]
-# 2.x releases for desugar_jdk_libs are weird and broken
-# noinspection GradleDependency
 android-desugarJdkLibs = "com.android.tools:desugar_jdk_libs:1.2.2"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidxActivity" }
 androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidxActivity" }