diff --git a/app/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme b/app/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme
index cfba478..49ddcc5 100644
--- a/app/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme
+++ b/app/iosApp/iosApp.xcodeproj/xcshareddata/xcschemes/iosApp.xcscheme
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   version = "1.7">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+   version = "1.3">
+   <BuildAction>
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
+            buildForRunning = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "B4B7972B44BDD2578B417581"
@@ -21,25 +15,11 @@
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
-   </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
+      buildConfiguration = "Release"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <BuildableProductRunnable>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "B4B7972B44BDD2578B417581"
@@ -53,18 +33,4 @@
          referenceType = "1">
       </LocationScenarioReference>
    </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
 </Scheme>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d01ee75..d0edfff 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ android-minSdk = "26"
 android-targetSdk = "36"
 # Platform specific versions
 agp = "8.13.0"
-kotlin = "2.3.0-Beta1"
+kotlin = "2.2.21"
 androidx-activity = "1.11.0"
 androidx-core = "1.17.0"
 androidx-espresso = "3.7.0"
@@ -99,6 +99,6 @@ kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 
-# Buildlogic defined plugins -> buildlogic/convention/build.gradle.kts
+# Buildlogic defined plugins -> echo/convention/build.gradle.kts
 composeDevKit = { id = "dev.carlosmartino.plugins.composeMultiplatform", version = "unspecified" }
 kotlinDevKit = { id = "dev.carlosmartino.plugins.kotlinMultiplatform", version = "unspecified" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index daa6b2a..f9b70af 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,4 +1,3 @@
-rootProject.name = "Template"
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
@@ -29,8 +28,15 @@ dependencyResolutionManagement {
     }
 }
 
+rootProject.name = "Template"
+
+// Template App module
 include(":app:composeApp")
+
+// Core modules
 include(":bedrock:designsystem")
 include(":bedrock:common")
 include(":bedrock:navigation")
+
+// Feature modules
 include(":features:common")