diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index 97fff8ee5c..1577bbbd40 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -454,8 +454,7 @@ class LoggedInFlowNode(
                     .build()
             }
             NavTarget.Ftue -> {
-                ftueEntryPoint.nodeBuilder(this, buildContext)
-                    .build()
+                ftueEntryPoint.createNode(this, buildContext)
             }
             NavTarget.RoomDirectorySearch -> {
                 roomDirectoryEntryPoint.nodeBuilder(this, buildContext)
diff --git a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/FtueEntryPoint.kt b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/FtueEntryPoint.kt
index f719064fde..3d5aae3860 100644
--- a/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/FtueEntryPoint.kt
+++ b/features/ftue/api/src/main/kotlin/io/element/android/features/ftue/api/FtueEntryPoint.kt
@@ -7,14 +7,6 @@
 
 package io.element.android.features.ftue.api
 
-import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
-import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
 
-interface FtueEntryPoint : FeatureEntryPoint {
-    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
-
-    interface NodeBuilder {
-        fun build(): Node
-    }
-}
+interface FtueEntryPoint : SimpleFeatureEntryPoint
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt
index db3c6a9c91..4fa086f4cd 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPoint.kt
@@ -9,7 +9,6 @@ package io.element.android.features.ftue.impl
 
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
@@ -19,13 +18,7 @@ import io.element.android.libraries.architecture.createNode
 @ContributesBinding(AppScope::class)
 @Inject
 class DefaultFtueEntryPoint : FtueEntryPoint {
-    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): FtueEntryPoint.NodeBuilder {
-        val plugins = ArrayList<Plugin>()
-
-        return object : FtueEntryPoint.NodeBuilder {
-            override fun build(): Node {
-                return parentNode.createNode<FtueFlowNode>(buildContext, plugins)
-            }
-        }
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+        return parentNode.createNode<FtueFlowNode>(buildContext)
     }
 }
diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt
index e3f0d7b2a6..50cc2eadce 100644
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueEntryPointTest.kt
@@ -53,8 +53,7 @@ class DefaultFtueEntryPointTest {
                 },
             )
         }
-        val result = entryPoint.nodeBuilder(parentNode, BuildContext.root(null))
-            .build()
+        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
         assertThat(result).isInstanceOf(FtueFlowNode::class.java)
     }
 }
diff --git a/features/licenses/api/src/main/kotlin/io/element/android/features/licenses/api/OpenSourceLicensesEntryPoint.kt b/features/licenses/api/src/main/kotlin/io/element/android/features/licenses/api/OpenSourceLicensesEntryPoint.kt
index e4beebe6ef..a2dbdde60d 100644
--- a/features/licenses/api/src/main/kotlin/io/element/android/features/licenses/api/OpenSourceLicensesEntryPoint.kt
+++ b/features/licenses/api/src/main/kotlin/io/element/android/features/licenses/api/OpenSourceLicensesEntryPoint.kt
@@ -7,9 +7,6 @@
 
 package io.element.android.features.licenses.api
 
-import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
 
-interface OpenSourceLicensesEntryPoint {
-    fun getNode(node: Node, buildContext: BuildContext): Node
-}
+interface OpenSourceLicensesEntryPoint : SimpleFeatureEntryPoint
diff --git a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt
index 425346a90e..8ffbc05ed3 100644
--- a/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt
+++ b/features/licenses/impl/src/main/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPoint.kt
@@ -18,7 +18,7 @@ import io.element.android.libraries.architecture.createNode
 @ContributesBinding(AppScope::class)
 @Inject
 class DefaultOpenSourcesLicensesEntryPoint : OpenSourceLicensesEntryPoint {
-    override fun getNode(node: Node, buildContext: BuildContext): Node {
-        return node.createNode<DependenciesFlowNode>(buildContext)
+    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
+        return parentNode.createNode<DependenciesFlowNode>(buildContext)
     }
 }
diff --git a/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt b/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt
index abd6c5e23e..3209e28fe6 100644
--- a/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt
+++ b/features/licenses/impl/src/test/kotlin/io/element/android/features/licenses/impl/DefaultOpenSourcesLicensesEntryPointTest.kt
@@ -31,7 +31,7 @@ class DefaultOpenSourcesLicensesEntryPointTest {
                 plugins = plugins,
             )
         }
-        val result = entryPoint.getNode(parentNode, BuildContext.root(null))
+        val result = entryPoint.createNode(parentNode, BuildContext.root(null))
         assertThat(result).isInstanceOf(DependenciesFlowNode::class.java)
     }
 }
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/history/PollHistoryEntryPoint.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/history/PollHistoryEntryPoint.kt
index 7ca61340c4..49f5f92b87 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/history/PollHistoryEntryPoint.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/history/PollHistoryEntryPoint.kt
@@ -7,10 +7,6 @@
 
 package io.element.android.features.poll.api.history
 
-import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
-import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.architecture.SimpleFeatureEntryPoint
 
-interface PollHistoryEntryPoint : FeatureEntryPoint {
-    fun createNode(parentNode: Node, buildContext: BuildContext): Node
-}
+interface PollHistoryEntryPoint : SimpleFeatureEntryPoint
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
index 6b0d8a7bec..57643e3931 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -261,7 +261,7 @@ class PreferencesFlowNode(
                     .build()
             }
             is NavTarget.OssLicenses -> {
-                openSourceLicensesEntryPoint.getNode(this, buildContext)
+                openSourceLicensesEntryPoint.createNode(this, buildContext)
             }
             NavTarget.AccountDeactivation -> {
                 accountDeactivationEntryPoint.createNode(this, buildContext)
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
index b7ebb08f3a..807ff3a5c6 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
@@ -56,7 +56,7 @@ class DefaultPreferencesEntryPointTest {
                     override fun nodeBuilder(parentNode: Node, buildContext: BuildContext) = lambdaError()
                 },
                 openSourceLicensesEntryPoint = object : OpenSourceLicensesEntryPoint {
-                    override fun getNode(node: Node, buildContext: BuildContext) = lambdaError()
+                    override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()
                 },
                 accountDeactivationEntryPoint = object : AccountDeactivationEntryPoint {
                     override fun createNode(parentNode: Node, buildContext: BuildContext) = lambdaError()