diff --git a/app-feature-preview/build.gradle.kts b/app-feature-preview/build.gradle.kts
index b8661a101b..a0b952441c 100644
--- a/app-feature-preview/build.gradle.kts
+++ b/app-feature-preview/build.gradle.kts
@@ -10,6 +10,18 @@ android {
         versionCode = 1
         versionName = "1.0"
     }
+
+    packaging {
+        resources {
+            excludes += listOf(
+                "META-INF/DEPENDENCIES",
+            )
+        }
+    }
+
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
 }
 
 dependencies {
diff --git a/app-feature-preview/lint-baseline.xml b/app-feature-preview/lint-baseline.xml
new file mode 100644
index 0000000000..5182475262
--- /dev/null
+++ b/app-feature-preview/lint-baseline.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.0.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.0.2)" variant="all" version="8.0.2">
+
+    <issue
+        id="CustomX509TrustManager"
+        message="Implementing a custom `X509TrustManager` is error-prone and likely to be insecure. It is likely to disable certificate validation altogether, and is non-trivial to implement correctly without calling Android&apos;s default implementation."
+        errorLine1="    private class SecureX509TrustManager implements X509TrustManager {"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java"
+            line="70"
+            column="19"/>
+    </issue>
+
+</issues>
diff --git a/app-feature-preview/src/main/AndroidManifest.xml b/app-feature-preview/src/main/AndroidManifest.xml
index f718382b3c..8c931c3f87 100644
--- a/app-feature-preview/src/main/AndroidManifest.xml
+++ b/app-feature-preview/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
         android:name=".FeatureApplication"
         android:allowBackup="true"
diff --git a/feature/account/setup/build.gradle.kts b/feature/account/setup/build.gradle.kts
index f7f0351b2f..e946434e51 100644
--- a/feature/account/setup/build.gradle.kts
+++ b/feature/account/setup/build.gradle.kts
@@ -11,5 +11,7 @@ dependencies {
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.core.common)
 
+    implementation(projects.feature.autodiscovery.service)
+
     testImplementation(projects.core.ui.compose.testing)
 }