diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index bfb35e6d4..af67ba42a 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
     <issue
         id="InvalidPackage"
@@ -181,24 +181,24 @@
 
     <issue
         id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        childCount.text = &quot;$count&quot;"
-        errorLine2="                          ~~~~~~~~">
+        message="Number formatting does not take into account locale settings. Consider using `String.format` instead."
+        errorLine1="    binding.passwordLengthText.setText(prefs.getInt(DICEWARE_LENGTH, 5).toString())"
+        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/app/passwordstore/ui/adapters/PasswordItemRecyclerAdapter.kt"
-            line="77"
-            column="27"/>
+            file="src/main/java/app/passwordstore/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt"
+            line="46"
+            column="40"/>
     </issue>
 
     <issue
         id="SetTextI18n"
-        message="Do not concatenate text displayed with `setText`. Use resource string with placeholders."
-        errorLine1="        ?.let { proxyPort.setText(&quot;$it&quot;) }"
-        errorLine2="                                  ~~~~~">
+        message="Number formatting does not take into account locale settings. Consider using `String.format` instead."
+        errorLine1="    binding.lengthNumber.setText(prefs.getInt(PreferenceKeys.LENGTH, 20).toString())"
+        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt"
-            line="49"
-            column="35"/>
+            file="src/main/java/app/passwordstore/ui/dialogs/PasswordGeneratorDialogFragment.kt"
+            line="54"
+            column="34"/>
     </issue>
 
 </issues>
diff --git a/autofill-parser/lint-baseline.xml b/autofill-parser/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/autofill-parser/lint-baseline.xml
+++ b/autofill-parser/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>
diff --git a/coroutine-utils/lint-baseline.xml b/coroutine-utils/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/coroutine-utils/lint-baseline.xml
+++ b/coroutine-utils/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>
diff --git a/crypto/common/lint-baseline.xml b/crypto/common/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/crypto/common/lint-baseline.xml
+++ b/crypto/common/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>
diff --git a/crypto/pgpainless/lint-baseline.xml b/crypto/pgpainless/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/crypto/pgpainless/lint-baseline.xml
+++ b/crypto/pgpainless/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>
diff --git a/format/common/lint-baseline.xml b/format/common/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/format/common/lint-baseline.xml
+++ b/format/common/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 40155718f..f61001ba1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.5.2"
+agp = "8.6.0"
 androidxActivity = "1.9.1"
 bouncycastle = "1.78.1"
 coroutines = "1.8.1"
diff --git a/passgen/diceware/lint-baseline.xml b/passgen/diceware/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/passgen/diceware/lint-baseline.xml
+++ b/passgen/diceware/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>
diff --git a/passgen/random/lint-baseline.xml b/passgen/random/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/passgen/random/lint-baseline.xml
+++ b/passgen/random/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>
diff --git a/sentry-stub/lint-baseline.xml b/sentry-stub/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/sentry-stub/lint-baseline.xml
+++ b/sentry-stub/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>
diff --git a/ui/compose/lint-baseline.xml b/ui/compose/lint-baseline.xml
index b68482a5e..2c8fe410f 100644
--- a/ui/compose/lint-baseline.xml
+++ b/ui/compose/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.0)" variant="all" version="8.5.0">
+<issues format="6" by="lint 8.6.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.6.0)" variant="all" version="8.6.0">
 
 </issues>