diff --git a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts
index 2723c8dc..8b09491c 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts
+++ b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.binary-compatibility.gradle.kts
@@ -17,6 +17,5 @@ apiValidation {
       "diceware",
       "random",
       "sentry-stub",
-      "ui-compose",
     )
 }
diff --git a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts
index e61b03a8..0dc5fbbb 100644
--- a/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts
+++ b/build-logic/kotlin-plugins/src/main/kotlin/com.github.android-password-store.kotlin-common.gradle.kts
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 val additionalCompilerArgs =
   listOf(
-    "-Xopt-in=kotlin.RequiresOptIn",
+    "-opt-in=kotlin.RequiresOptIn",
     "-P",
     "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true",
   )
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fbefef1e..ac1f826a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ compose = "1.2.0-alpha06"
 coroutines = "1.6.0"
 flowbinding = "1.2.0"
 hilt = "2.41"
-kotlin = "1.6.10"
+kotlin = "1.6.20"
 leakcanary = "2.8.1"
 lifecycle = "2.4.1"
 
@@ -43,7 +43,7 @@ build-agp = "com.android.tools.build:gradle:7.1.2"
 build-binarycompat = "org.jetbrains.kotlinx:binary-compatibility-validator:0.8.0"
 build-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.6.10"
 build-download = "de.undercouch:gradle-download-task:5.0.4"
-build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20"
 build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.19.0"
 build-okhttp = "com.squareup.okhttp3:okhttp:4.9.3"
 build-r8 = "com.android.tools:r8:3.3.15-dev"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1840ee1c..b002cffc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -56,5 +56,3 @@ include("passgen:diceware")
 include("passgen:random")
 
 include("sentry-stub")
-
-include("ui-compose")