diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e3fbc3287e..fae8587d88 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,7 +17,7 @@
 @file:Suppress("UnstableApiUsage")
 
 import com.android.build.api.variant.FilterConfiguration.FilterType.ABI
-import extension.allFeatures
+import extension.allFeaturesImpl
 import extension.allLibraries
 
 // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
@@ -197,7 +197,7 @@ knit {
 
 dependencies {
     allLibraries()
-    allFeatures()
+    allFeaturesImpl()
     implementation(projects.libraries.matrix.impl)
     implementation(projects.libraries.dateformatter.impl)
     implementation(projects.libraries.sessionStorage.impl)
diff --git a/appnav/build.gradle.kts b/appnav/build.gradle.kts
index 77f4690793..ee9a4fc238 100644
--- a/appnav/build.gradle.kts
+++ b/appnav/build.gradle.kts
@@ -16,6 +16,8 @@
 
 @file:Suppress("UnstableApiUsage")
 
+import extension.allFeaturesApi
+
 // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
@@ -36,14 +38,7 @@ dependencies {
     implementation(libs.dagger)
     kapt(libs.dagger.compiler)
 
-    implementation(projects.features.messages.api)
-    implementation(projects.features.roomlist.api)
-    implementation(projects.features.rageshake.api)
-    implementation(projects.features.login.api)
-    implementation(projects.features.preferences.api)
-    implementation(projects.features.logout.api)
-    implementation(projects.features.onboarding.api)
-    implementation(projects.features.createroom.api)
+    allFeaturesApi()
 
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
index 812b281ffd..a0d574c803 100644
--- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
+++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt
@@ -61,7 +61,18 @@ fun DependencyHandlerScope.allLibraries() {
     implementation(project(":libraries:di"))
 }
 
-fun DependencyHandlerScope.allFeatures() {
+fun DependencyHandlerScope.allFeaturesApi() {
+    implementation(project(":features:onboarding:api"))
+    implementation(project(":features:login:api"))
+    implementation(project(":features:logout:api"))
+    implementation(project(":features:roomlist:api"))
+    implementation(project(":features:messages:api"))
+    implementation(project(":features:rageshake:api"))
+    implementation(project(":features:preferences:api"))
+    implementation(project(":features:createroom:api"))
+}
+
+fun DependencyHandlerScope.allFeaturesImpl() {
     implementation(project(":features:onboarding:impl"))
     implementation(project(":features:login:impl"))
     implementation(project(":features:logout:impl"))
diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts
index 6d970e34b0..86431f2c1c 100644
--- a/tests/uitests/build.gradle.kts
+++ b/tests/uitests/build.gradle.kts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import extension.allFeatures
+import extension.allFeaturesImpl
 import extension.allLibraries
 
 // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
@@ -40,5 +40,5 @@ dependencies {
     ksp(libs.showkase.processor)
 
     allLibraries()
-    allFeatures()
+    allFeaturesImpl()
 }