From 80c7bb0270ceec1895de605164b0ddd03bd0192a Mon Sep 17 00:00:00 2001
From: therajanmaurya <5724482+therajanmaurya@users.noreply.github.com>
Date: Mon, 5 Jan 2026 01:27:29 +0000
Subject: [PATCH] chore: Sync directories and files from upstream

---
 .github/workflows/build-and-deploy-site.yml   |  65 ++
 .github/workflows/cache-cleanup.yaml          |  15 +
 .github/workflows/monthly-version-tag.yml     |  66 ++
 .../multi-platform-build-and-publish.yml      |  45 +-
 .github/workflows/pr-check.yml                |  32 +-
 .github/workflows/promote-to-production.yml   |   4 +-
 .github/workflows/sync-dirs.yaml              | 140 ++--
 .github/workflows/tag-weekly-release.yml      |  88 ++-
 .run/cmp-android.run.xml                      |  74 +++
 .run/cmp-desktop.run.xml                      |   5 -
 .run/cmp-web-js.run.xml                       |   2 +-
 Gemfile                                       |  10 +-
 Gemfile.lock                                  | 148 ++---
 build-logic/README.md                         |  10 +-
 build-logic/convention/build.gradle.kts       | 135 ++--
 ...droidApplicationComposeConventionPlugin.kt |   5 +-
 .../AndroidApplicationConventionPlugin.kt     |  29 +-
 ...roidApplicationFirebaseConventionPlugin.kt |  20 +-
 ...droidApplicationFlavorsConventionPlugin.kt |   5 +-
 .../kotlin/AndroidLintConventionPlugin.kt     |  17 +-
 .../main/kotlin/CMPFeatureConventionPlugin.kt |  47 +-
 .../src/main/kotlin/DetektConventionPlugin.kt |  26 +
 .../main/kotlin/FieldSkippingClassVisitor.kt  |   4 +-
 .../main/kotlin/GitHooksConventionPlugin.kt   |  57 ++
 .../main/kotlin/KMPKoinConventionPlugin.kt    |  22 +-
 .../main/kotlin/KMPLibraryConventionPlugin.kt |  30 +-
 .../main/kotlin/KMPRoomConventionPlugin.kt    |   9 +-
 .../KeystoreManagementConventionPlugin.kt     | 153 +++++
 .../src/main/kotlin/KtlintConventionPlugin.kt |  19 +
 .../main/kotlin/SpotlessConventionPlugin.kt   |  25 +
 .../kotlin/org/convention/AndroidCompose.kt   |  63 ++
 .../convention/AndroidInstrumentedTests.kt    |  19 +
 .../kotlin/org/convention/AppBuildType.kt     |   9 +
 .../main/kotlin/org/convention/AppFlavor.kt   |  48 ++
 .../src/main/kotlin/org/convention/Badging.kt | 156 +++++
 .../src/main/kotlin/org/convention/Detekt.kt  |  43 ++
 .../org/convention/GradleManagedDevices.kt    |  70 ++
 .../org/convention/HierarchyTemplate.kt       | 179 ++++++
 .../src/main/kotlin/org/convention/Jacoco.kt  | 134 ++++
 .../kotlin/org/convention/KotlinAndroid.kt    |  77 +++
 .../org/convention/KotlinMultiplatform.kt     |  40 ++
 .../kotlin/org/convention/PrintTestApks.kt    |  95 +++
 .../org/convention/ProjectExtensions.kt       |  39 ++
 .../main/kotlin/org/convention/Spotless.kt    |  36 ++
 .../convention/keystore/BaseKeystoreTask.kt   |  97 +++
 .../keystore/ConfigurationFileUpdatesTask.kt  | 347 ++++++++++
 .../keystore/ConfigurationValidator.kt        | 332 ++++++++++
 .../keystore/EnvironmentOverrideHandler.kt    | 306 +++++++++
 .../org/convention/keystore/KeystoreConfig.kt |  76 +++
 .../keystore/KeystoreGenerationTask.kt        | 353 +++++++++++
 .../org/convention/keystore/KeystoreLogger.kt |  46 ++
 .../org/convention/keystore/SecretsConfig.kt  |  65 ++
 .../convention/keystore/SecretsEnvParser.kt   | 243 +++++++
 .../keystore/SecretsEnvUpdateTask.kt          | 598 ++++++++++++++++++
 .../ConfigurationFileUpdatesTaskTest.kt       | 364 +++++++++++
 .../keystore/KeystoreGenerationTaskTest.kt    | 306 +++++++++
 .../keystore/SecretsEnvParserTest.kt          | 389 ++++++++++++
 .../keystore/SecretsEnvUpdateTaskTest.kt      | 450 +++++++++++++
 build-logic/settings.gradle.kts               |  16 -
 ci-prepush.bat                                |   4 +-
 ci-prepush.sh                                 |   2 +
 cmp-android/build.gradle.kts                  | 105 +--
 cmp-android/lint-baseline.xml                 |   2 +-
 cmp-android/prodRelease-badging.txt           | 196 +++---
 cmp-android/proguard-rules.pro                |   4 +-
 cmp-android/src/main/AndroidManifest.xml      |  56 +-
 .../main/kotlin/cmp/android/app/AndroidApp.kt |  28 +-
 .../cmp/android/app/AppThemeExtensions.kt     |  21 +
 .../cmp/android/app/BuildConfigUtils.kt       |  65 ++
 .../app/ComponentActivityExtensions.kt        |  51 +-
 .../cmp/android/app/ConfigurationExtension.kt |  15 +
 .../kotlin/cmp/android/app/MainActivity.kt    | 120 ++--
 cmp-android/src/prod/AndroidManifest.xml      |  33 +
 cmp-desktop/build.gradle.kts                  |  93 +--
 cmp-desktop/src/jvmMain/kotlin/main.kt        |   9 +-
 cmp-ios/Configuration/Config.xcconfig         |   4 +-
 cmp-ios/Podfile                               |  24 +-
 cmp-ios/iosApp.xcodeproj/project.pbxproj      |  83 ++-
 .../UserInterfaceState.xcuserstate            | Bin 24141 -> 34158 bytes
 .../xcschemes/xcschememanagement.plist        |   2 +-
 .../xcschemes/iosApp.xcscheme                 |  32 +
 .../xcschemes/xcschememanagement.plist        |  14 +
 .../xcschemes/xcschememanagement.plist        |   5 +
 cmp-ios/iosApp/ContentView.swift              |   3 +-
 cmp-ios/iosApp/Info.plist                     |  12 +-
 cmp-shared/build.gradle.kts                   |  29 +-
 cmp-shared/cmp_shared.podspec                 |   2 +-
 .../commonMain/kotlin/cmp/shared/SharedApp.kt |  29 +-
 .../kotlin/cmp/shared/utils/KoinExt.kt        |   2 +-
 .../kotlin/org/mifos/shared/ViewController.kt |   4 +-
 cmp-web/build.gradle.kts                      |   9 +-
 cmp-web/src/jsMain/kotlin/Application.kt      |   4 +-
 cmp-web/src/wasmJsMain/kotlin/Main.kt         |   6 +-
 config/detekt/detekt.yml                      |  13 +-
 core-base/analytics/build.gradle.kts          |   2 +-
 .../core/base/analytics/di/AnalyticsModule.kt |   2 +-
 .../src/androidMain/AndroidManifest.xml       |   2 +-
 .../di/AnalyticsModule.kt                     |   2 +-
 .../core/base/analytics/AnalyticsEvent.kt     |  27 +-
 .../base/analytics/AnalyticsExtensions.kt     |   4 +-
 .../core/base/analytics/AnalyticsHelper.kt    |   2 +-
 .../base/analytics/NoOpAnalyticsHelper.kt     |   2 +-
 .../core/base/analytics/PerformanceTracker.kt |   4 +-
 .../base/analytics/StubAnalyticsHelper.kt     |   2 +-
 .../core/base/analytics/TestingUtils.kt       |   2 +-
 .../template/core/base/analytics/UiHelpers.kt |   2 +-
 .../core/base/analytics/ValidationUtils.kt    |   2 +-
 .../core/base/analytics/di/AnalyticsModule.kt |   2 +-
 .../analytics/di/AnalyticsModule.desktop.kt   |   2 +-
 .../di/AnalyticsModule.js.kt                  |   2 +-
 .../AnalyticsModule.native.kt                 |   2 +-
 .../base/analytics/FirebaseAnalyticsHelper.kt |   2 +-
 .../analytics/di/AnalyticsModule.wasmJs.kt    |   2 +-
 core-base/common/build.gradle.kts             |   2 +-
 .../src/androidMain/AndroidManifest.xml       |   2 +-
 .../core/base/common/Parcelize.android.kt     |   2 +-
 .../base/common/di/CommonModule.android.kt    |   2 +-
 .../common/manager/DispatchManagerImpl.kt     |   2 +-
 .../template/core/base/common/DataState.kt    |   2 +-
 .../core/base/common/DataStateExtensions.kt   |   2 +-
 .../core/base/common/ImageExtension.kt        |   2 +-
 .../template/core/base/common/Parcelize.kt    |   2 +-
 .../core/base/common/di/CommonModule.kt       |   2 +-
 .../base/common/manager/DispatcherManager.kt  |   2 +-
 .../core/base/common/Parcelize.nonAndroid.kt  |   2 +-
 .../base/common/di/CommonModule.nonAndroid.kt |   2 +-
 .../common/manager/DispatchManagerImpl.kt     |   2 +-
 core-base/database/build.gradle.kts           |   2 +-
 .../core/base/database/AppDatabaseFactory.kt  |   2 +-
 .../template/core/base/database/Room.kt       |   2 +-
 .../core/base/database/TypeConverter.kt       |   2 +-
 .../core/base/database/AppDatabaseFactory.kt  |   2 +-
 .../core/base/database/AppDatabaseFactory.kt  |   2 +-
 .../core/base/database/Room.nonJsCommon.kt    |   2 +-
 .../database/TypeConverter.nonJsCommon.kt     |   2 +-
 core-base/designsystem/build.gradle.kts       |   2 +-
 .../base/designsystem/KptMaterialTheme.kt     |   2 +-
 .../core/base/designsystem/KptTheme.kt        |   2 +-
 .../base/designsystem/KptThemeExtensions.kt   |   2 +-
 .../designsystem/component/BounceAnimation.kt |   2 +-
 .../component/KptAnimationSpecs.kt            |   2 +-
 .../component/KptShimmerLoadingBox.kt         |   2 +-
 .../designsystem/component/KptSnackbarHost.kt |   2 +-
 .../designsystem/component/KptTopAppBar.kt    |   2 +-
 .../designsystem/component/SlideTransition.kt |   2 +-
 .../designsystem/core/ComponentStateHolder.kt |   2 +-
 .../base/designsystem/core/KptComponent.kt    |   2 +-
 .../core/KptTopAppBarConfiguration.kt         |   2 +-
 .../layout/AdaptiveListDetailPaneScaffold.kt  |   2 +-
 .../AdaptiveNavigableListDetailScaffold.kt    |   2 +-
 ...AdaptiveNavigableSupportingPaneScaffold.kt |   2 +-
 .../layout/AdaptiveNavigationSuiteScaffold.kt |   2 +-
 .../base/designsystem/layout/KptFlowColumn.kt |   2 +-
 .../base/designsystem/layout/KptFlowRow.kt    |   2 +-
 .../core/base/designsystem/layout/KptGrid.kt  |   2 +-
 .../designsystem/layout/KptMasonryGrid.kt     |   2 +-
 .../layout/KptResponsiveLayout.kt             |   2 +-
 .../designsystem/layout/KptSidebarLayout.kt   |   2 +-
 .../base/designsystem/layout/KptSplitPane.kt  |   2 +-
 .../core/base/designsystem/layout/KptStack.kt |   2 +-
 .../designsystem/theme/KptColorSchemeImpl.kt  |   2 +-
 core-base/network/build.gradle.kts            |   4 +-
 .../base/network/KtorHttpClient.android.kt    |  18 +
 .../core/base/network/KtorHttpClient.kt       | 162 +++++
 .../core/base/network/NetworkError.kt         |  58 ++
 .../core/base/network/NetworkResult.kt        |  39 ++
 .../factory/ResultSuspendConverterFactory.kt  | 118 ++++
 .../base/network/KtorHttpClient.desktop.kt    |  18 +
 .../core/base/network/KtorHttpClient.js.kt    |  18 +
 .../base/network/KtorHttpClient.native.kt     |  18 +
 .../base/network/KtorHttpClient.wasmJs.kt     |  18 +
 core-base/platform/build.gradle.kts           |   2 +-
 .../platform/LocalManagerProviders.android.kt |   2 +-
 .../platform/context/AppContext.android.kt    |   2 +-
 .../GarbageCollectionManager.android.kt       |   2 +-
 .../base/platform/intent/IntentManagerImpl.kt |   2 +-
 .../platform/review/AppReviewManagerImpl.kt   |   2 +-
 .../platform/update/AppUpdateManagerImpl.kt   |   2 +-
 .../base/platform/utils/AndroidBuildUtils.kt  |   2 +-
 .../base/platform/LocalManagerProviders.kt    |   2 +-
 .../core/base/platform/context/AppContext.kt  |   2 +-
 .../core/base/platform/di/PlatformModule.kt   |   2 +-
 .../garbage/GarbageCollectionManager.kt       |   2 +-
 .../garbage/GarbageCollectionManagerImpl.kt   |   2 +-
 .../base/platform/intent/IntentManager.kt     |   2 +-
 .../core/base/platform/model/MimeType.kt      |   2 +-
 .../base/platform/review/AppReviewManager.kt  |   2 +-
 .../base/platform/update/AppUpdateManager.kt  |   2 +-
 .../platform/LocalManagerProviders.native.kt  |   2 +-
 .../platform/context/AppContext.native.kt     |   2 +-
 .../GarbageCollectionManager.nonAndroid.kt    |   2 +-
 .../base/platform/intent/IntentManagerImpl.kt |   2 +-
 .../platform/review/AppReviewManagerImpl.kt   |   2 +-
 .../platform/update/AppUpdateManagerImpl.kt   |   2 +-
 core-base/ui/README.md                        |  29 +-
 core-base/ui/build.gradle.kts                 |   2 +-
 .../core/base/ui/JankStatsExtensions.kt       |   2 +-
 .../core/base/ui/ReportDrawnExt.android.kt    |   2 +-
 .../core/base/ui/ShareUtils.android.kt        |  71 ++-
 .../template/core/base/ui/BackgroundEvent.kt  |   2 +-
 .../template/core/base/ui/BaseViewModel.kt    |   2 +-
 .../template/core/base/ui/EventsEffect.kt     |   2 +-
 .../template/core/base/ui/ImageLoaderExt.kt   |  92 ++-
 .../core/base/ui/JankStatsExtension.kt        |   2 +-
 .../core/base/ui/LifecycleEventEffect.kt      |   2 +-
 .../core/base/ui/NavGraphBuilderExtensions.kt |   2 +-
 .../template/core/base/ui/ReportDrawnExt.kt   |   2 +-
 .../template/core/base/ui/ShareUtils.kt       |  48 +-
 .../template/core/base/ui/SharedElementExt.kt |   2 +-
 .../kotlin/template/core/base/ui/StringExt.kt |   2 +-
 .../template/core/base/ui/Transition.kt       |   2 +-
 .../core/base/ui/ShareUtils.desktop.kt        |  69 +-
 .../template/core/base/ui/ShareUtils.kt       |  20 +-
 .../core/base/ui/ShareUtils.native.kt         |  58 +-
 .../core/base/ui/JankStatsExtension.jvmJs.kt  |   2 +-
 .../core/base/ui/ReportDrawnExt.jvmJs.kt      |   2 +-
 fastlane/AppFile                              |  14 +-
 fastlane/FastFile                             | 457 +++++--------
 fastlane/README.md                            |  44 +-
 scripts/pre-commit.sh                         |   7 +-
 scripts/pre-push.sh                           |  17 +-
 221 files changed, 7676 insertions(+), 1344 deletions(-)
 create mode 100644 .github/workflows/build-and-deploy-site.yml
 create mode 100644 .github/workflows/cache-cleanup.yaml
 create mode 100644 .github/workflows/monthly-version-tag.yml
 create mode 100644 .run/cmp-android.run.xml
 create mode 100644 build-logic/convention/src/main/kotlin/DetektConventionPlugin.kt
 create mode 100644 build-logic/convention/src/main/kotlin/GitHooksConventionPlugin.kt
 create mode 100644 build-logic/convention/src/main/kotlin/KeystoreManagementConventionPlugin.kt
 create mode 100644 build-logic/convention/src/main/kotlin/KtlintConventionPlugin.kt
 create mode 100644 build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/AndroidCompose.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/AndroidInstrumentedTests.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/AppBuildType.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/AppFlavor.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/Badging.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/Detekt.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/GradleManagedDevices.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/HierarchyTemplate.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/Jacoco.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/KotlinAndroid.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/KotlinMultiplatform.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/PrintTestApks.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/ProjectExtensions.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/Spotless.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/BaseKeystoreTask.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/ConfigurationFileUpdatesTask.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/ConfigurationValidator.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/EnvironmentOverrideHandler.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreConfig.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreGenerationTask.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreLogger.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsConfig.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsEnvParser.kt
 create mode 100644 build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsEnvUpdateTask.kt
 create mode 100644 build-logic/convention/src/test/kotlin/org/convention/keystore/ConfigurationFileUpdatesTaskTest.kt
 create mode 100644 build-logic/convention/src/test/kotlin/org/convention/keystore/KeystoreGenerationTaskTest.kt
 create mode 100644 build-logic/convention/src/test/kotlin/org/convention/keystore/SecretsEnvParserTest.kt
 create mode 100644 build-logic/convention/src/test/kotlin/org/convention/keystore/SecretsEnvUpdateTaskTest.kt
 mode change 100755 => 100644 ci-prepush.sh
 create mode 100644 cmp-android/src/main/kotlin/cmp/android/app/AppThemeExtensions.kt
 create mode 100644 cmp-android/src/main/kotlin/cmp/android/app/BuildConfigUtils.kt
 create mode 100644 cmp-android/src/main/kotlin/cmp/android/app/ConfigurationExtension.kt
 create mode 100644 cmp-android/src/prod/AndroidManifest.xml
 create mode 100644 cmp-ios/iosApp.xcodeproj/xcuserdata/skniyajali.xcuserdatad/xcschemes/iosApp.xcscheme
 create mode 100644 cmp-ios/iosApp.xcodeproj/xcuserdata/skniyajali.xcuserdatad/xcschemes/xcschememanagement.plist
 create mode 100644 cmp-ios/iosApp.xcworkspace/xcuserdata/skniyajali.xcuserdatad/xcschemes/xcschememanagement.plist
 create mode 100644 core-base/network/src/androidMain/kotlin/template/core/base/network/KtorHttpClient.android.kt
 create mode 100644 core-base/network/src/commonMain/kotlin/template/core/base/network/KtorHttpClient.kt
 create mode 100644 core-base/network/src/commonMain/kotlin/template/core/base/network/NetworkError.kt
 create mode 100644 core-base/network/src/commonMain/kotlin/template/core/base/network/NetworkResult.kt
 create mode 100644 core-base/network/src/commonMain/kotlin/template/core/base/network/factory/ResultSuspendConverterFactory.kt
 create mode 100644 core-base/network/src/desktopMain/kotlin/template/core/base/network/KtorHttpClient.desktop.kt
 create mode 100644 core-base/network/src/jsMain/kotlin/template/core/base/network/KtorHttpClient.js.kt
 create mode 100644 core-base/network/src/nativeMain/kotlin/template/core/base/network/KtorHttpClient.native.kt
 create mode 100644 core-base/network/src/wasmJsMain/kotlin/template/core/base/network/KtorHttpClient.wasmJs.kt

diff --git a/.github/workflows/build-and-deploy-site.yml b/.github/workflows/build-and-deploy-site.yml
new file mode 100644
index 000000000..280e58d83
--- /dev/null
+++ b/.github/workflows/build-and-deploy-site.yml
@@ -0,0 +1,65 @@
+# This workflow is designed to automate the process of building and deploying a Kotlin/JS web application to GitHub Pages.
+# It ensures that whenever changes are merged into the dev branch or when manually triggered, the web application is built,
+# packaged, and deployed to the GitHub Pages environment, making it accessible online.
+
+# Key Features:
+# - Automated web application build using Kotlin/JS
+# - Deployment to GitHub Pages
+# - Supports configurable web project module name
+# - Manages deployment concurrency and environment settings
+# - Provides secure deployment with proper permissions
+
+# Prerequisites:
+# - Kotlin Multiplatform/JS project configured with Gradle
+# - Web module set up for browser distribution
+# - Java 17 or compatible version
+# - GitHub Pages enabled in repository settings
+
+# Workflow Configuration:
+# - Requires input of `web_package_name` to specify the web project module
+# - Uses Windows runner for build process
+# - Leverages GitHub Actions for build, pages configuration, and deployment
+
+# Workflow Triggers:
+# - Can be manually called from other workflows
+# - Supports workflow_call for reusability across projects
+
+# Deployment Process:
+# 1. Checkout repository code
+# 2. Set up Java development environment
+# 3. Build Kotlin/JS web application
+# 4. Configure GitHub Pages
+# 5. Upload built artifacts
+# 6. Deploy to GitHub Pages
+
+# https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/build-and-deploy-site.yaml
+
+# ##############################################################################
+#                 DON'T EDIT THIS FILE UNLESS NECESSARY                        #
+# ##############################################################################
+
+name: Build And Deploy Web App
+
+# Trigger conditions for the workflow
+on:
+  workflow_dispatch:
+
+# Concurrency settings to manage multiple workflow runs
+# This ensures orderly deployment to production environment
+concurrency:
+  group: "web-pages"
+  cancel-in-progress: false
+
+permissions:
+  contents: read  # Read repository contents
+  pages: write    # Write to GitHub Pages
+  id-token: write # Write authentication tokens
+  pull-requests: write # Write to pull requests
+
+jobs:
+  build_and_deploy_web:
+    name: Build And Deploy Web App
+    uses: openMF/mifos-x-actionhub/.github/workflows/build-and-deploy-site.yaml@v1.0.2
+    secrets: inherit
+    with:
+      web_package_name: 'cmp-web' # <-- Change with your web package name
diff --git a/.github/workflows/cache-cleanup.yaml b/.github/workflows/cache-cleanup.yaml
new file mode 100644
index 000000000..02685f363
--- /dev/null
+++ b/.github/workflows/cache-cleanup.yaml
@@ -0,0 +1,15 @@
+name: Cleanup Cache
+
+on:
+  pull_request:
+    types: [ closed ]
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    uses: openMF/mifos-x-actionhub/.github/workflows/cache-cleanup.yaml@v1.0.2
+    with:
+      cleanup_pr: ${{ github.event_name == 'pull_request' && github.event.repository.private == true }}
+      cleanup_all: ${{ github.event_name == 'workflow_dispatch' }}
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/monthly-version-tag.yml b/.github/workflows/monthly-version-tag.yml
new file mode 100644
index 000000000..e96c13615
--- /dev/null
+++ b/.github/workflows/monthly-version-tag.yml
@@ -0,0 +1,66 @@
+# Automated Monthly Release Versioning Workflow
+# ============================================
+
+# Purpose:
+# - Automatically create consistent monthly version tags
+# - Implement a calendar-based versioning strategy
+# - Facilitate easy tracking of monthly releases
+
+# Versioning Strategy:
+# - Tag format: YYYY.MM.0 (e.g., 2024.01.0 for January 2024)
+# - First digit: Full year
+# - Second digit: Month (01-12)
+# - Third digit: Patch version (starts at 0, allows for potential updates)
+
+# Key Features:
+# - Runs automatically on the first day of each month at 3:30 AM UTC
+# - Can be manually triggered via workflow_dispatch
+# - Uses GitHub Actions to generate tags programmatically
+# - Provides a predictable and systematic versioning approach
+
+# Prerequisites:
+# - Repository configured with GitHub Actions
+# - Permissions to create tags
+# - Access to actions/checkout and tag creation actions
+
+# Workflow Triggers:
+# - Scheduled monthly run
+# - Manual workflow dispatch
+# - Callable from other workflows
+
+# Actions Used:
+# 1. actions/checkout@v4 - Checks out repository code
+# 2. josStorer/get-current-time - Retrieves current timestamp
+# 3. rickstaa/action-create-tag - Creates Git tags
+
+# Example Generated Tags:
+# - 2024.01.0 (January 2024 initial release)
+# - 2024.02.0 (February 2024 initial release)
+# - 2024.02.1 (Potential patch for February 2024)
+
+# https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/monthly-version-tag.yaml
+
+# ##############################################################################
+#                 DON'T EDIT THIS FILE UNLESS NECESSARY                        #
+# ##############################################################################
+
+name: Tag Monthly Release
+
+on:
+  # Allow manual triggering of the workflow
+  workflow_dispatch:
+  # Schedule the workflow to run monthly
+  schedule:
+    # Runs at 03:30 UTC on the first day of every month
+    # Cron syntax: minute hour day-of-month month day-of-week
+    - cron: '30 3 1 * *'
+
+concurrency:
+  group: "monthly-release"
+  cancel-in-progress: false
+
+jobs:
+  monthly_release:
+    name: Tag Monthly Release
+    uses: openMF/mifos-x-actionhub/.github/workflows/monthly-version-tag.yaml@v1.0.2
+    secrets: inherit
diff --git a/.github/workflows/multi-platform-build-and-publish.yml b/.github/workflows/multi-platform-build-and-publish.yml
index 9d256dd3e..95eb380b9 100644
--- a/.github/workflows/multi-platform-build-and-publish.yml
+++ b/.github/workflows/multi-platform-build-and-publish.yml
@@ -71,7 +71,7 @@ on:
 
       target_branch:
         type: string
-        default: 'development'
+        default: 'dev'
         description: 'Target branch for release'
 
       distribute_ios_firebase:
@@ -89,16 +89,6 @@ on:
         default: false
         description: Distribute iOS App to Appstore
 
-      distribute_macos_testflight:
-        type: boolean
-        default: false
-        description: Distribute macOS App via TestFlight (App Store Connect)
-
-      distribute_macos_appstore:
-        type: boolean
-        default: false
-        description: Distribute macOS App to Appstore
-
 permissions:
   contents: write
   id-token: write
@@ -111,32 +101,27 @@ concurrency:
 jobs:
   multi_platform_build_and_publish:
     name: Multi-Platform Build and Publish
-    uses: openMF/mifos-x-actionhub/.github/workflows/multi-platform-build-and-publish.yaml@v1.0.7
+    uses: openMF/mifos-x-actionhub/.github/workflows/multi-platform-build-and-publish.yaml@v1.0.3
     with:
-      java-version: 21
       release_type: ${{ inputs.release_type }}
       target_branch: ${{ inputs.target_branch }}
-      android_package_name: 'cmp-android'
-      ios_package_name: 'cmp-ios'
-      desktop_package_name: 'cmp-desktop'
-      web_package_name: 'cmp-web'
-      tester_groups: 'mifos-mobile-apps'
-      app_identifier: 'org.mifos.mobile'
+      android_package_name: 'cmp-android' # <-- Change this to your android package name
+      ios_package_name: 'cmp-ios' # <-- Change this to your ios package name
+      desktop_package_name: 'cmp-desktop' # <-- Change this to your desktop package name
+      web_package_name: 'cmp-web'   # <-- Change this to your web package name
+      tester_groups: 'mifos-mobile-apps' # <-- Change this to your Firebase tester group
+      app_identifier: 'org.mifos.kmp.template'
       git_url: 'git@github.com:openMF/ios-provisioning-profile.git'
-      git_branch: 'mifos-mobile'
+      git_branch: 'master'
       match_type: 'adhoc'
-      provisioning_profile_name: 'match AdHoc org.mifos.mobile'
-      firebase_app_id: '1:728434912738:ios:ee2e0815a6915b351a1dbb'
-      metadata_path: './fastlane/metadata/ios'
+      provisioning_profile_name: 'match AdHoc org.mifos.kmp.template'
+      firebase_app_id: '1:728434912738:ios:1d81f8e53ca7a6f31a1dbb'
+      metadata_path: './fastlane/metadata'
       use_cocoapods: true         # <-- Set to true if using CocoaPods integration for KMP
       shared_module: ':cmp-shared' # <-- Gradle path to your shared KMP module (e.g., :shared)
-      cmp_desktop_dir: 'cmp-desktop'
-      keychain_name: signing.keychain-db # optional
       distribute_ios_firebase: ${{ inputs.distribute_ios_firebase }}
       distribute_ios_testflight: ${{ inputs.distribute_ios_testflight }}
       distribute_ios_appstore: ${{ inputs.distribute_ios_appstore }}
-      distribute_macos_testflight: ${{ inputs.distribute_macos_testflight }}
-      distribute_macos_appstore: ${{ inputs.distribute_macos_appstore }}
     secrets:
       original_keystore_file: ${{ secrets.ORIGINAL_KEYSTORE_FILE }}
       original_keystore_file_password: ${{ secrets.ORIGINAL_KEYSTORE_FILE_PASSWORD }}
@@ -151,12 +136,6 @@ jobs:
       notarization_apple_id: ${{ secrets.NOTARIZATION_APPLE_ID }}
       notarization_password: ${{ secrets.NOTARIZATION_PASSWORD }}
       notarization_team_id: ${{ secrets.NOTARIZATION_TEAM_ID }}
-      keychain_password: ${{ secrets.KEYCHAIN_PASSWORD }}
-      certificates_password: ${{ secrets.CERTIFICATES_PASSWORD }}
-      mac_app_distribution_certificate_b64: ${{ secrets.MAC_APP_DISTRIBUTION_CERTIFICATE_B64 }}
-      mac_installer_distribution_certificate_b64: ${{ secrets.MAC_INSTALLER_DISTRIBUTION_CERTIFICATE_B64 }}
-      mac_embedded_provision_b64: ${{ secrets.MAC_EMBEDDED_PROVISION_B64 }}
-      mac_runtime_provision_b64: ${{ secrets.MAC_RUNTIME_PROVISION_B64 }}
       appstore_key_id: ${{ secrets.APPSTORE_KEY_ID }}
       appstore_issuer_id: ${{ secrets.APPSTORE_ISSUER_ID }}
       appstore_auth_key: ${{ secrets.APPSTORE_AUTH_KEY }}
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 0452cca62..42c3a6665 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -13,7 +13,7 @@
 ### Workflow Jobs
 # 1. **Setup**: Prepares the build environment
 #   - Checks out repository code
-#   - Sets up Java (configurable; defaults to 17)
+#   - Sets up Java 17
 #   - Configures Gradle
 #   - Manages dependency caching
 #
@@ -36,7 +36,7 @@
 #   - Generates platform-specific executables and packages
 #
 ### Prerequisites
-#   - Java (configurable; default 17)
+#   - Java 17
 #   - Gradle
 #   - Configured build scripts for:
 #       - Android module
@@ -49,16 +49,10 @@
 ### Configuration Parameters
 # The workflow requires two input parameters:
 #
-#   |         Parameter      |              Description           |  Type  | Required  |
-#   |------------------------|------------------------------------|--------|-----------|
-#   | `android_package_name` | Name of the Android project module | String |    Yes    |
-#   | `desktop_package_name` | Name of the Desktop project module | String |    Yes    |
-#   |`web_package_name`      | Name of the Web (Kotlin/JS) project/module | String | No|
-#   |`ios_package_name`      | Name of the iOS project/module	| String |	No	       |
-#   |`build_ios`	         | Build iOS targets as part of PR checks |	Boolean	| No   |
-#   |`use_cocoapods`         | Use CocoaPods for iOS integration	| Boolean	| No   |
-#   |`shared_module	         | Path of the shared KMP module  |	String	| (required when build_ios=true) |
-#   |`java-version	         | Java version to use (configurable; defaults to 17)| No  |
+#   |         Parameter      |              Description           |  Type  | Required |
+#   |------------------------|------------------------------------|--------|----------|
+#   | `android_package_name` | Name of the Android project module | String |    Yes   |
+#   | `desktop_package_name` | Name of the Desktop project module | String |    Yes   |
 #
 
 # https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/pr-check.yaml
@@ -68,18 +62,18 @@
 # ##############################################################################
 
 
-name: PR Checks for KMP
+name: PR Checks
 
 # Trigger conditions for the workflow
 on:
   push:
-    branches: [ development ]  # Runs on pushes to dev branch
+    branches: [ dev ]  # Runs on pushes to dev branch
   pull_request:
-    branches: [ development ]  # Runs on pushes to dev branch
+    branches: [ dev ]  # Runs on pushes to dev branch
 
 # Concurrency settings to prevent multiple simultaneous workflow runs
 concurrency:
-  group: pr-kmp-${{ github.ref }}
+  group: pr-${{ github.ref }}
   cancel-in-progress: true  # Cancels previous runs if a new one is triggered
 
 permissions:
@@ -87,9 +81,8 @@ permissions:
 
 jobs:
   pr_checks:
-    name: PR Checks KMP
-    uses: openMF/mifos-x-actionhub/.github/workflows/pr-check.yaml@v1.0.7
-    secrets: inherit
+    name: PR Checks
+    uses: openMF/mifos-x-actionhub/.github/workflows/pr-check.yaml@v1.0.3
     with:
       android_package_name: 'cmp-android' # <-- Change Your Android Package Name
       desktop_package_name: 'cmp-desktop' # <-- Change Your Desktop Package Name
@@ -98,4 +91,3 @@ jobs:
       build_ios: true # <-- Change to 'false' if you don't want to build iOS
       use_cocoapods: true
       shared_module: ':cmp-shared'
-      java-version: '21'
diff --git a/.github/workflows/promote-to-production.yml b/.github/workflows/promote-to-production.yml
index 8099c4ffa..081e3d629 100644
--- a/.github/workflows/promote-to-production.yml
+++ b/.github/workflows/promote-to-production.yml
@@ -43,7 +43,7 @@
 # end
 # ```
 
-# https://github.com/openMF/mifos-mobile-github-actions/blob/main/.github/workflows/promote-to-production.yaml
+# https://github.com/openMF/mifos-x-actionhub/blob/main/.github/workflows/promote-to-production.yaml
 
 # ##############################################################################
 #                 DON'T EDIT THIS FILE UNLESS NECESSARY                        #
@@ -70,6 +70,6 @@ jobs:
   # Job to promote app from beta to production in Play Store
   play_promote_production:
     name: Promote Beta to Production Play Store
-    uses: openMF/mifos-x-actionhub/.github/workflows/promote-to-production.yaml@v1.0.7
+    uses: openMF/mifos-x-actionhub/.github/workflows/promote-to-production.yaml@v1.0.2
     secrets:
       playstore_creds: ${{ secrets.PLAYSTORECREDS }}
diff --git a/.github/workflows/sync-dirs.yaml b/.github/workflows/sync-dirs.yaml
index 6a947f649..d8ef43626 100644
--- a/.github/workflows/sync-dirs.yaml
+++ b/.github/workflows/sync-dirs.yaml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: development
+          ref: dev
 
       - name: Setup Git config
         run: |
@@ -32,12 +32,14 @@ jobs:
 
       - name: Add upstream remote and fetch
         run: |
+          set -euo pipefail
           UPSTREAM="${{ inputs.upstream || 'https://github.com/openMF/kmp-project-template.git' }}"
           git remote add upstream "$UPSTREAM" || true
           git fetch upstream || exit 1
 
       - name: Check upstream/dev exists
         run: |
+          set -euo pipefail
           if ! git rev-parse --verify upstream/dev >/dev/null 2>&1; then
             echo "Error: upstream/dev branch does not exist"
             exit 1
@@ -45,12 +47,16 @@ jobs:
 
       - name: Create and checkout temporary branch
         run: |
+          set -euo pipefail
           TEMP_BRANCH="temp-sync-branch-${{ github.run_number }}"
           git checkout -b "$TEMP_BRANCH" upstream/dev || exit 1
           echo "TEMP_BRANCH=$TEMP_BRANCH" >> $GITHUB_ENV
 
       - name: Sync directories and files
+        shell: bash
         run: |
+          set -euo pipefail
+
           # Declare directories and files to sync
           DIRS=(
             "cmp-android"
@@ -66,14 +72,14 @@ jobs:
             ".github"
             ".run"
           )
-          
+
           FILES=(
             "Gemfile"
             "Gemfile.lock"
             "ci-prepush.bat"
             "ci-prepush.sh"
           )
-          
+
           # Define exclusions
           declare -A EXCLUSIONS=(
             ["cmp-android"]="src/main/res dependencies src/main/ic_launcher-playstore.png google-services.json"
@@ -82,25 +88,27 @@ jobs:
             ["cmp-ios"]="iosApp/Assets.xcassets"
             ["root"]="secrets.env"
           )
-          
+
           # Function to check if path should be excluded
           should_exclude() {
             local dir=$1
             local path=$2
-          
-            # Check for root exclusions
-            if [[ "$dir" == "." && -n "${EXCLUSIONS["root"]}" ]]; then
-              local root_excluded_paths=(${EXCLUSIONS["root"]})
+
+            # Check for root exclusions (when dir is "." or "root")
+            if [[ "$dir" == "." || "$dir" == "root" ]] && [[ -v "EXCLUSIONS[root]" ]]; then
+              local root_excluded_paths
+              IFS=' ' read -ra root_excluded_paths <<< "${EXCLUSIONS[root]}"
               for excluded in "${root_excluded_paths[@]}"; do
                 if [[ "$path" == *"$excluded"* ]]; then
                   return 0
                 fi
               done
             fi
-          
+
             # Check directory-specific exclusions
-            if [[ -n "${EXCLUSIONS[$dir]}" ]]; then
-              local excluded_paths=(${EXCLUSIONS[$dir]})
+            if [[ -v "EXCLUSIONS[$dir]" ]]; then
+              local excluded_paths
+              IFS=' ' read -ra excluded_paths <<< "${EXCLUSIONS[$dir]}"
               for excluded in "${excluded_paths[@]}"; do
                 if [[ "$path" == *"$excluded"* ]]; then
                   return 0
@@ -109,29 +117,31 @@ jobs:
             fi
             return 1
           }
-          
+
           # Function to preserve excluded paths
           preserve_excluded() {
             local dir=$1
-            if [[ -n "${EXCLUSIONS[$dir]}" ]]; then
-              local excluded_paths=(${EXCLUSIONS[$dir]})
+            if [[ -v "EXCLUSIONS[$dir]" ]]; then
+              local excluded_paths
+              IFS=' ' read -ra excluded_paths <<< "${EXCLUSIONS[$dir]}"
               for excluded in "${excluded_paths[@]}"; do
                 local full_path="$dir/$excluded"
                 if [[ -e "$full_path" ]]; then
                   echo "Preserving excluded path: $full_path"
                   local temp_path="temp_excluded/$full_path"
                   mkdir -p "$(dirname "$temp_path")"
-                  cp -r "$full_path" "$(dirname "$temp_path")"
+                  cp -r "$full_path" "$(dirname "$temp_path")/"
                 fi
               done
             fi
           }
-          
+
           # Function to restore excluded paths
           restore_excluded() {
             local dir=$1
-            if [[ -n "${EXCLUSIONS[$dir]}" ]]; then
-              local excluded_paths=(${EXCLUSIONS[$dir]})
+            if [[ -v "EXCLUSIONS[$dir]" ]]; then
+              local excluded_paths
+              IFS=' ' read -ra excluded_paths <<< "${EXCLUSIONS[$dir]}"
               for excluded in "${excluded_paths[@]}"; do
                 local full_path="$dir/$excluded"
                 local temp_path="temp_excluded/$full_path"
@@ -139,16 +149,17 @@ jobs:
                   echo "Restoring excluded path: $full_path"
                   mkdir -p "$(dirname "$full_path")"
                   rm -rf "$full_path"
-                  cp -r "$temp_path" "$(dirname "$full_path")"
+                  cp -r "$temp_path" "$(dirname "$full_path")/"
                 fi
               done
             fi
           }
-          
+
           # Function to preserve root-level excluded files
           preserve_root_files() {
-            if [[ -n "${EXCLUSIONS["root"]}" ]]; then
-              local excluded_paths=(${EXCLUSIONS["root"]})
+            if [[ -v "EXCLUSIONS[root]" ]]; then
+              local excluded_paths
+              IFS=' ' read -ra excluded_paths <<< "${EXCLUSIONS[root]}"
               for excluded in "${excluded_paths[@]}"; do
                 if [[ -e "$excluded" ]]; then
                   echo "Preserving root-level excluded file: $excluded"
@@ -158,11 +169,12 @@ jobs:
               done
             fi
           }
-          
+
           # Function to restore root-level excluded files
           restore_root_files() {
-            if [[ -n "${EXCLUSIONS["root"]}" ]]; then
-              local excluded_paths=(${EXCLUSIONS["root"]})
+            if [[ -v "EXCLUSIONS[root]" ]]; then
+              local excluded_paths
+              IFS=' ' read -ra excluded_paths <<< "${EXCLUSIONS[root]}"
               for excluded in "${excluded_paths[@]}"; do
                 if [[ -e "temp_excluded/root/$excluded" ]]; then
                   echo "Restoring root-level excluded file: $excluded"
@@ -171,63 +183,81 @@ jobs:
               done
             fi
           }
-          
+
           # Create temp directory for exclusions
           mkdir -p temp_excluded
-          
+
           # Preserve root-level exclusions before sync
           preserve_root_files
-          
-          # Switch to development branch
-          git checkout development
-          
+
+          # Switch to dev branch
+          git checkout dev
+
           # Sync directories
           for dir in "${DIRS[@]}"; do
-            if [ ! -d "$dir" ]; then
+            if [[ ! -d "$dir" ]]; then
               echo "Creating $dir..."
               mkdir -p "$dir"
             fi
-          
+
             # Preserve excluded paths before sync
             if [[ -d "$dir" ]]; then
               preserve_excluded "$dir"
             fi
-          
+
             echo "Syncing $dir..."
-            git checkout "${{ env.TEMP_BRANCH }}" -- "$dir" || exit 1
-          
+            if ! git checkout "${{ env.TEMP_BRANCH }}" -- "$dir" 2>/dev/null; then
+              echo "Warning: Could not sync directory $dir (may not exist in upstream)"
+            fi
+
             # Restore excluded paths after sync
             restore_excluded "$dir"
           done
-          
+
           # Sync files
           for file in "${FILES[@]}"; do
-            dir=$(dirname "$file")
-            if ! should_exclude "$dir" "$file"; then
-              echo "Syncing $file..."
-              git checkout "${{ env.TEMP_BRANCH }}" -- "$file" || true
-            else
+            file_dir=$(dirname "$file")
+            file_name=$(basename "$file")
+
+            # Check root exclusions for root-level files
+            if [[ "$file_dir" == "." ]]; then
+              if should_exclude "root" "$file_name"; then
+                echo "Skipping excluded file: $file"
+                continue
+              fi
+            elif should_exclude "$file_dir" "$file"; then
               echo "Skipping excluded file: $file"
+              continue
+            fi
+
+            echo "Syncing $file..."
+            if ! git checkout "${{ env.TEMP_BRANCH }}" -- "$file" 2>/dev/null; then
+              echo "Warning: Could not sync file $file (may not exist in upstream)"
             fi
           done
-          
+
           # Restore root-level excluded files
           restore_root_files
-          
+
           # Cleanup temp directory
           rm -rf temp_excluded
 
+          echo "Sync completed successfully!"
+
       - name: Clean up temporary branch
         if: always()
-        run: git branch -D "${{ env.TEMP_BRANCH }}" || true
+        run: git branch -D "${{ env.TEMP_BRANCH }}" 2>/dev/null || true
 
       - name: Check for changes
         id: check_changes
         run: |
           if [[ -n "$(git status --porcelain)" ]]; then
             echo "has_changes=true" >> $GITHUB_OUTPUT
+            echo "Changes detected:"
+            git status --short
           else
             echo "has_changes=false" >> $GITHUB_OUTPUT
+            echo "No changes detected"
           fi
 
       - name: Create Pull Request
@@ -239,35 +269,37 @@ jobs:
           title: "chore: Sync directories and files from upstream"
           body: |
             Automated sync of directories and files from upstream repository.
-            
+
             Changes included in this sync:
-            
-            Directories:
+
+            **Directories:**
             - cmp-android (excluding src/main/res, dependencies, ic_launcher-playstore.png, google-services.json)
             - cmp-desktop (excluding icons)
             - cmp-ios (excluding iosApp/Assets.xcassets)
             - cmp-web (excluding src/jsMain/resources, src/wasmJsMain/resources)
             - cmp-shared
+            - core-base
             - build-logic
             - fastlane
             - scripts
             - config
             - .github
             - .run
-            
-            Files:
+
+            **Files:**
             - Gemfile
             - Gemfile.lock
             - ci-prepush.bat
             - ci-prepush.sh
-            
-            Root-level exclusions:
+
+            **Root-level exclusions:**
             - secrets.env
-            
+
+            ---
             Workflow run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
           branch: sync-dirs-${{ github.run_number }}
           delete-branch: true
           labels: |
             sync
             automated pr
-          base: development
\ No newline at end of file
+          base: dev
diff --git a/.github/workflows/tag-weekly-release.yml b/.github/workflows/tag-weekly-release.yml
index cd90ab15f..9607410db 100644
--- a/.github/workflows/tag-weekly-release.yml
+++ b/.github/workflows/tag-weekly-release.yml
@@ -1,29 +1,104 @@
+# Weekly Release Tagging and Beta Deployment Workflow
+# ===================================================
+
+# Purpose:
+# - Automate weekly version tagging for consistent software versioning
+# - Trigger automated beta releases across multiple platforms
+# - Maintain a predictable release cycle
+
+# Workflow Overview:
+# - Runs automatically every Sunday at 4:00 AM UTC
+# - Supports manual triggering via workflow_dispatch
+# - Utilizes Gradle Reckon plugin for intelligent versioning
+# - Triggers multi-platform build and publish workflow
+
+# Key Features:
+# - Automatic semantic versioning
+# - Cross-platform release automation
+# - Configurable target branch for releases
+# - Full repository history checkout for accurate versioning
+
+# Versioning Strategy:
+# - Uses Reckon Gradle plugin for semantic versioning
+# - Generates production-ready (final) version tags
+# - Provides consistent and predictable version incrementation
+
+# Release Process:
+# 1. Checkout repository with full commit history
+# 2. Setup Java 17 development environment
+# 3. Create and push new version tag
+# 4. Trigger multi-platform build and publish workflow
+
+# Prerequisites:
+# - Gradle project configured with Reckon plugin
+# - Java 17 development environment
+# - Configured multi-platform build workflow
+# - GitHub Actions permissions for workflow dispatch
+
+# Workflow Inputs:
+# - target_branch: Branch to use for releases (default: 'dev')
+#   Allows flexible release targeting across different branches
+
+# Security Considerations:
+# - Uses GitHub's native GITHUB_TOKEN for authentication
+# - Controlled workflow dispatch with specific inputs
+# - Limited to authorized repository members
+
+# Potential Use Cases:
+# - Regular software release cycles
+# - Automated beta testing distributions
+# - Consistent multi-platform deployment
+
+# Workflow Triggers:
+# - Scheduled weekly run (Sunday 4:00 AM UTC)
+# - Manual workflow dispatch
+# - Callable from other workflows
+
+# ##############################################################################
+#                 DON'T EDIT THIS FILE UNLESS NECESSARY                        #
+# ##############################################################################
+
 name: Tag Weekly Release
 
 on:
+  # Allow manual triggering of the workflow
   workflow_dispatch:
+  # Schedule the workflow to run weekly
   schedule:
+    # Runs at 04:00 UTC every Sunday
+    # Cron syntax: minute hour day-of-month month day-of-week
     - cron: '0 4 * * 0'
+
+concurrency:
+  group: "weekly-release"
+  cancel-in-progress: false
+
 jobs:
   tag:
     name: Tag Weekly Release
     runs-on: ubuntu-latest
     steps:
+      # Checkout the repository with full history for proper versioning
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 21
+      # Setup Java environment for Gradle operations
+      - name: Set up JDK 17
         uses: actions/setup-java@v4.2.2
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '17'
 
+      # Create and push a new version tag using Reckon
+      # This uses the 'final' stage for production-ready releases
       - name: Tag Weekly Release
         env:
-          GITHUB_TOKEN: ${{ secrets.TAG_PUSH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew :reckonTagPush -Preckon.stage=final
 
+      # Trigger the build and publish workflow for beta release
+      # This starts the process of building and deploying the app to various platforms
       - name: Trigger Workflow
         uses: actions/github-script@v7
         with:
@@ -31,9 +106,10 @@ jobs:
             github.rest.actions.createWorkflowDispatch({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              workflow_id: 'android-release.yml',
-              ref: 'development',
+              workflow_id: 'multi-platform-build-and-publish.yml',
+              ref: 'dev', 
               inputs: {
                 "release_type": "beta",
               },
-            })
\ No newline at end of file
+            })
+
diff --git a/.run/cmp-android.run.xml b/.run/cmp-android.run.xml
new file mode 100644
index 000000000..3750e7d07
--- /dev/null
+++ b/.run/cmp-android.run.xml
@@ -0,0 +1,74 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="cmp-android" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+    <module name="kmp-project-template.cmp-android" />
+    <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
+    <option name="DEPLOY" value="true" />
+    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+    <option name="DEPLOY_AS_INSTANT" value="false" />
+    <option name="ARTIFACT_NAME" value="" />
+    <option name="PM_INSTALL_OPTIONS" value="" />
+    <option name="ALL_USERS" value="false" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="ALLOW_ASSUME_VERIFIED" value="false" />
+    <option name="CLEAR_APP_STORAGE" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+    <option name="MODE" value="default_activity" />
+    <option name="RESTORE_ENABLED" value="false" />
+    <option name="RESTORE_FILE" value="" />
+    <option name="RESTORE_FRESH_INSTALL_ONLY" value="false" />
+    <option name="CLEAR_LOGCAT" value="false" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+    <option name="DEBUGGER_TYPE" value="Auto" />
+    <Auto>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Auto>
+    <Hybrid>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Hybrid>
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Java>
+    <Native>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Native>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+    </Profilers>
+    <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY" value="" />
+    <option name="ACTIVITY_CLASS" value="" />
+    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+    <method v="2">
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/cmp-desktop.run.xml b/.run/cmp-desktop.run.xml
index 88186e065..32bd0b3af 100644
--- a/.run/cmp-desktop.run.xml
+++ b/.run/cmp-desktop.run.xml
@@ -1,11 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="cmp-desktop" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="DEVELOPER_DIR" value="/Applications/Xcode.app/Contents/Developer" />
-        </map>
-      </option>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
diff --git a/.run/cmp-web-js.run.xml b/.run/cmp-web-js.run.xml
index 89a8b9653..ae0413e3c 100644
--- a/.run/cmp-web-js.run.xml
+++ b/.run/cmp-web-js.run.xml
@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":cmp-web:jsBrowserRun" />
+          <option value=":cmp-web:jsBrowserDevelopmentRun" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/Gemfile b/Gemfile
index 54cbd00f0..090749838 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,14 @@
 source "https://rubygems.org"
 
+ruby '3.3.6'
+
+# Add compatibility gems for Ruby 3.3+
+gem "abbrev"
+gem "base64"
+gem "mutex_m"
+gem "bigdecimal"
+
 gem "fastlane"
-gem "cocoapods"
+
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index 2d23059c6..fc32bdf26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,101 +5,44 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.2.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
+    abbrev (0.1.2)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    algoliasearch (1.27.5)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
     artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.1048.0)
-    aws-sdk-core (3.218.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1174.0)
+    aws-sdk-core (3.233.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.98.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+      logger
+    aws-sdk-kms (1.114.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.180.0)
-      aws-sdk-core (~> 3, >= 3.216.0)
+    aws-sdk-s3 (1.200.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.2.0)
-    benchmark (0.3.0)
-    bigdecimal (3.2.2)
+    base64 (0.3.0)
+    bigdecimal (3.3.1)
     claide (1.1.0)
-    cocoapods (1.16.2)
-      addressable (~> 2.8)
-      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.16.2)
-      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.1, < 3.0)
-      cocoapods-plugins (>= 1.0.0, < 2.0)
-      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.6.0, < 2.0)
-      cocoapods-try (>= 1.1.0, < 2.0)
-      colored2 (~> 3.1)
-      escape (~> 0.0.4)
-      fourflusher (>= 2.3.0, < 3.0)
-      gh_inspector (~> 1.0)
-      molinillo (~> 0.8.0)
-      nap (~> 1.0)
-      ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.27.0, < 2.0)
-    cocoapods-core (1.16.2)
-      activesupport (>= 5.0, < 8)
-      addressable (~> 2.8)
-      algoliasearch (~> 1.0)
-      concurrent-ruby (~> 1.1)
-      fuzzy_match (~> 2.0.4)
-      nap (~> 1.0)
-      netrc (~> 0.11)
-      public_suffix (~> 4.0)
-      typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (2.1)
-    cocoapods-plugins (1.0.0)
-      nap
-    cocoapods-search (1.0.1)
-    cocoapods-trunk (1.6.0)
-      nap (>= 0.8, < 2.0)
-      netrc (~> 0.11)
-    cocoapods-try (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
-    drb (2.2.0)
-      ruby2_keywords
     emoji_regex (3.2.3)
-    escape (0.0.4)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
     excon (0.112.0)
     faraday (1.10.4)
       faraday-em_http (~> 1.0)
@@ -117,10 +60,10 @@ GEM
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
@@ -130,7 +73,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.226.0)
+    fastlane (2.228.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -170,17 +113,14 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.0)
+      xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-firebase_app_distribution (0.10.0)
+    fastlane-plugin-firebase_app_distribution (0.10.1)
       google-apis-firebaseappdistribution_v1 (~> 0.3.0)
       google-apis-firebaseappdistribution_v1alpha (~> 0.2.0)
     fastlane-plugin-increment_build_number (0.0.4)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
-    ffi (1.17.1-arm64-darwin)
-    fourflusher (2.3.1)
-    fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -202,12 +142,12 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
+    google-cloud-errors (1.5.0)
     google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -225,46 +165,40 @@ GEM
     highline (2.0.3)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
+    httpclient (2.9.0)
+      mutex_m
     jmespath (1.6.2)
-    json (2.9.1)
-    jwt (2.10.1)
+    json (2.15.1)
+    jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.20.0)
-    molinillo (0.8.0)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
+    mutex_m (0.3.0)
     nanaimo (0.4.0)
-    nap (1.1.0)
-    naturally (2.2.1)
-    netrc (0.11.0)
+    naturally (2.3.0)
     nkf (0.2.0)
     optparse (0.6.0)
     os (1.1.4)
     plist (3.7.2)
-    public_suffix (4.0.7)
-    rake (13.2.1)
+    public_suffix (6.0.2)
+    rake (13.3.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.0)
+    rexml (3.4.4)
     rouge (3.28.0)
-    ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
-    securerandom (0.3.1)
     security (0.1.5)
-    signet (0.19.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simctl (1.6.10)
       CFPropertyList
@@ -278,10 +212,6 @@ GEM
     tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.4.1)
-      ethon (>= 0.9.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
@@ -292,20 +222,26 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
+    xcpretty (0.4.1)
       rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  arm64-darwin-24
+  arm64-darwin-25
   ruby
 
 DEPENDENCIES
-  cocoapods
+  abbrev
+  base64
+  bigdecimal
   fastlane
   fastlane-plugin-firebase_app_distribution
   fastlane-plugin-increment_build_number
+  mutex_m
+
+RUBY VERSION
+   ruby 3.3.6p108
 
 BUNDLED WITH
-   2.5.18
+   2.7.2
diff --git a/build-logic/README.md b/build-logic/README.md
index f0ea8ede9..3852831e7 100644
--- a/build-logic/README.md
+++ b/build-logic/README.md
@@ -29,10 +29,10 @@ setup.
 
 Current list of convention plugins:
 
-- [`mifos.android.application`](convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt),
-  [`mifos.android.library`](convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt),
-  [`mifos.android.test`](convention/src/main/kotlin/AndroidTestConventionPlugin.kt):
+- [`android.application`](convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt),
+  [`android.library`](convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt),
+  [`android.test`](convention/src/main/kotlin/AndroidTestConventionPlugin.kt):
   Configures common Android and Kotlin options.
-- [`mifos.android.application.compose`](convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt),
-  [`mifos.android.library.compose`](convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt):
+- [`android.application.compose`](convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt),
+  [`android.library.compose`](convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt):
   Configures Jetpack Compose options
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
index e0168aa06..e696e0505 100644
--- a/build-logic/convention/build.gradle.kts
+++ b/build-logic/convention/build.gradle.kts
@@ -1,20 +1,21 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     `kotlin-dsl`
 }
 
-group = "org.mifos.mobile.buildlogic"
+group = "org.convention.buildlogic"
 
-// Configure the build-logic plugins to target JDK 17
+// Configure the build-logic plugins to target JDK 19
 // This matches the JDK used to build the project, and is not related to what is running on device.
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.toString()
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
     }
 }
 
@@ -24,14 +25,27 @@ dependencies {
     compileOnly(libs.compose.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
-    compileOnly(libs.room.gradlePlugin)
     compileOnly(libs.detekt.gradlePlugin)
     compileOnly(libs.ktlint.gradlePlugin)
-    compileOnly(libs.spotless.gradlePlugin)
+    compileOnly(libs.spotless.gradle)
     implementation(libs.truth)
-
+    compileOnly(libs.androidx.room.gradle.plugin)
     compileOnly(libs.firebase.crashlytics.gradlePlugin)
     compileOnly(libs.firebase.performance.gradlePlugin)
+    
+    // Keystore management dependencies
+    implementation(libs.github.api)
+    implementation(libs.okhttp)
+    implementation(libs.jackson.core)
+    implementation(libs.jackson.databind)
+    implementation(libs.jackson.module.kotlin)
+    implementation(libs.commons.codec)
+    
+    // Test dependencies for keystore management
+    testImplementation(libs.junit.jupiter.api)
+    testImplementation(libs.junit.jupiter.engine)
+    testImplementation(libs.junit.jupiter.params)
+    testRuntimeOnly(libs.platform.junit.platform.launcher)
 }
 
 tasks {
@@ -39,21 +53,30 @@ tasks {
         enableStricterValidation = true
         failOnWarning = true
     }
+    
+    // Configure JUnit 5 for testing keystore management functionality
+    test {
+        useJUnitPlatform()
+        testLogging {
+            events("passed", "skipped", "failed")
+        }
+    }
 }
 
 gradlePlugin {
     plugins {
-        register("androidApplication") {
-            id = "mifos.android.application"
-            implementationClass = "AndroidApplicationConventionPlugin"
-        }
+        // Android Plugins
         register("androidApplicationCompose") {
-            id = "mifos.android.application.compose"
+            id = "org.convention.android.application.compose"
             implementationClass = "AndroidApplicationComposeConventionPlugin"
         }
+        register("androidApplication") {
+            id = "org.convention.android.application"
+            implementationClass = "AndroidApplicationConventionPlugin"
+        }
 
         register("androidFlavors") {
-            id = "mifos.android.application.flavors"
+            id = "org.convention.android.application.flavors"
             implementationClass = "AndroidApplicationFlavorsConventionPlugin"
         }
 
@@ -67,45 +90,6 @@ gradlePlugin {
             implementationClass = "AndroidLintConventionPlugin"
         }
 
-        // This can removed after migration
-        register("androidLibrary") {
-            id = "mifos.android.library"
-            implementationClass = "AndroidLibraryConventionPlugin"
-        }
-
-        register("androidLibraryCompose") {
-            id = "mifos.android.library.compose"
-            implementationClass = "AndroidLibraryComposeConventionPlugin"
-        }
-
-        register("androidFeature") {
-            id = "mifos.android.feature"
-            implementationClass = "AndroidFeatureConventionPlugin"
-        }
-
-        // Room Plugin
-        register("kmpRoom") {
-            id = "mifos.kmp.room"
-            implementationClass = "KMPRoomConventionPlugin"
-        }
-
-        // Utility Plugins
-        register("detekt") {
-            id = "mifos.detekt.plugin"
-            implementationClass = "MifosDetektConventionPlugin"
-            description = "Configures detekt for the project"
-        }
-        register("spotless") {
-            id = "mifos.spotless.plugin"
-            implementationClass = "MifosSpotlessConventionPlugin"
-            description = "Configures spotless for the project"
-        }
-        register("gitHooks") {
-            id = "mifos.git.hooks"
-            implementationClass = "MifosGitHooksConventionPlugin"
-            description = "Installs git hooks for the project"
-        }
-
         // KMP & CMP Plugins
         register("cmpFeature") {
             id = "org.convention.cmp.feature"
@@ -116,10 +100,47 @@ gradlePlugin {
             id = "org.convention.kmp.koin"
             implementationClass = "KMPKoinConventionPlugin"
         }
-
         register("kmpLibrary") {
             id = "org.convention.kmp.library"
             implementationClass = "KMPLibraryConventionPlugin"
         }
+
+        // Static Analysis & Formatting Plugins
+        register("detekt") {
+            id = "org.convention.detekt.plugin"
+            implementationClass = "DetektConventionPlugin"
+            description = "Configures detekt for the project"
+        }
+        register("spotless") {
+            id = "org.convention.spotless.plugin"
+            implementationClass = "SpotlessConventionPlugin"
+            description = "Configures spotless for the project"
+        }
+        register("ktlint") {
+            id = "org.convention.ktlint.plugin"
+            implementationClass = "KtlintConventionPlugin"
+            description = "Configures kotlinter for the project"
+        }
+        register("gitHooks") {
+            id = "org.convention.git.hooks"
+            implementationClass = "GitHooksConventionPlugin"
+            description = "Installs git hooks for the project"
+        }
+
+//        Room Plugin
+        register("KMPRoom"){
+            id = "mifos.kmp.room"
+            implementationClass = "KMPRoomConventionPlugin"
+            description = "Configures Room for the project"
+        }
+
+        // NEW ===============================
+
+        register("keystoreManagement") {
+            id = "org.convention.keystore.management"
+            implementationClass = "KeystoreManagementConventionPlugin"
+            description = "Configures keystore management tasks for the project"
+        }
+
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
index 2ec83e383..7b0ab73ef 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
@@ -1,10 +1,13 @@
 import com.android.build.api.dsl.ApplicationExtension
+import org.convention.configureAndroidCompose
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
-import org.mifos.mobile.configureAndroidCompose
 
+/**
+ * Plugin that applies the Android application and Compose plugins and configures them.
+ */
 class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index 8f19540fa..6aa8c9474 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -1,37 +1,34 @@
+
 import com.android.build.api.dsl.ApplicationExtension
-import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import com.android.build.gradle.BaseExtension
+import org.convention.configureGradleManagedDevices
+import org.convention.configureKotlinAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.getByType
-import org.mifos.mobile.configureBadgingTasks
-import org.mifos.mobile.configureKotlinAndroid
-import org.mifos.mobile.configurePrintApksTask
 
+/**
+ * Plugin that applies the Android application plugin and configures it.
+ */
 class AndroidApplicationConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
-
                 apply("com.dropbox.dependency-guard")
-                apply("mifos.detekt.plugin")
-                apply("mifos.spotless.plugin")
-                apply("mifos.git.hooks")
+                apply("org.convention.detekt.plugin")
+                apply("org.convention.spotless.plugin")
+                apply("org.convention.git.hooks")
                 apply("org.convention.android.application.lint")
                 apply("org.convention.android.application.firebase")
-
             }
 
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
-            }
-            extensions.configure<ApplicationAndroidComponentsExtension> {
-                configurePrintApksTask(this)
-                configureBadgingTasks(extensions.getByType<BaseExtension>(), this)
+                defaultConfig.targetSdk = 36
+                @Suppress("UnstableApiUsage")
+                testOptions.animationsDisabled = true
+                configureGradleManagedDevices(this)
             }
         }
     }
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
index 818904484..f9acb889c 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFirebaseConventionPlugin.kt
@@ -1,13 +1,27 @@
-
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
 
 import com.android.build.api.dsl.ApplicationExtension
 import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
+import org.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.mifos.mobile.libs
 
 class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -34,4 +48,4 @@ class AndroidApplicationFirebaseConventionPlugin : Plugin<Project> {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt
index 3a7394b66..83759a99a 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt
@@ -2,8 +2,11 @@ import com.android.build.api.dsl.ApplicationExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
-import org.mifos.mobile.configureFlavors
+import org.convention.configureFlavors
 
+/**
+ * Plugin that applies the Android application flavors plugin and configures it.
+ */
 class AndroidApplicationFlavorsConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
diff --git a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
index 09fdb72cc..884d6f076 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLintConventionPlugin.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
 
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.LibraryExtension
@@ -31,4 +46,4 @@ private fun Lint.configure() {
     sarifReport = true
     checkDependencies = true
     disable += "GradleDependency"
-}
\ No newline at end of file
+}
diff --git a/build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt
index ce47af4bf..c2531dce4 100644
--- a/build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt
@@ -1,41 +1,59 @@
+import org.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
-import org.mifos.mobile.libs
 
+/**
+ * Plugin that applies the CMP feature plugin and configures it.
+ * This plugin applies the following plugins:
+ * - org.mifos.kmp.library - Kotlin Multiplatform Library
+ * - org.mifos.kmp.koin - Koin for Kotlin Multiplatform
+ * - org.jetbrains.kotlin.plugin.compose - Kotlin Compose
+ * - org.jetbrains.compose - Compose Multiplatform
+ * - org.mifos.detekt.plugin - Detekt Plugin
+ * - org.mifos.spotless.plugin - Spotless Plugin
+ *
+ */
 class CMPFeatureConventionPlugin : Plugin<Project> {
-
     override fun apply(target: Project) {
         with(target) {
-            with(pluginManager) {
+            pluginManager.apply {
                 apply("org.convention.kmp.library")
                 apply("org.convention.kmp.koin")
                 apply("org.jetbrains.kotlin.plugin.compose")
                 apply("org.jetbrains.compose")
+                apply("org.convention.detekt.plugin")
+                apply("org.convention.spotless.plugin")
             }
 
             dependencies {
                 add("commonMainImplementation", project(":core:ui"))
+                add("commonMainImplementation", project(":core-base:ui"))
                 add("commonMainImplementation", project(":core:designsystem"))
-//                add("commonMainImplementation", project(":core:testing"))
+                add("commonMainImplementation", project(":core-base:designsystem"))
                 add("commonMainImplementation", project(":core:data"))
+                add("commonMainImplementation", project(":core-base:designsystem"))
+                add("commonMainImplementation", project(":core:analytics"))
 
                 add("commonMainImplementation", libs.findLibrary("koin.compose").get())
                 add("commonMainImplementation", libs.findLibrary("koin.compose.viewmodel").get())
 
                 add("commonMainImplementation", libs.findLibrary("jb.composeRuntime").get())
-                add("commonMainImplementation", libs.findLibrary("jb.lifecycle.compose").get())
                 add("commonMainImplementation", libs.findLibrary("jb.composeViewmodel").get())
                 add("commonMainImplementation", libs.findLibrary("jb.lifecycleViewmodel").get())
-                add("commonMainImplementation", libs.findLibrary("jb.lifecycleViewmodelSavedState").get())
+                add("commonMainImplementation", libs.findLibrary("jb.lifecycle.compose").get())
+
+                add(
+                    "commonMainImplementation",
+                    libs.findLibrary("jb.lifecycleViewmodelSavedState").get(),
+                )
                 add("commonMainImplementation", libs.findLibrary("jb.savedstate").get())
                 add("commonMainImplementation", libs.findLibrary("jb.bundle").get())
                 add("commonMainImplementation", libs.findLibrary("jb.composeNavigation").get())
-                add("commonMainImplementation", libs.findLibrary("kotlinx.collections.immutable").get())
-
-                add("androidMainImplementation", libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
-                add("androidMainImplementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
-                add("androidMainImplementation", libs.findLibrary("androidx.tracing.ktx").get())
+                add(
+                    "commonMainImplementation",
+                    libs.findLibrary("kotlinx.collections.immutable").get(),
+                )
 
                 add("androidMainImplementation", platform(libs.findLibrary("koin-bom").get()))
                 add("androidMainImplementation", libs.findLibrary("koin-android").get())
@@ -46,12 +64,7 @@ class CMPFeatureConventionPlugin : Plugin<Project> {
                 add("androidMainImplementation", libs.findLibrary("koin.androidx.compose").get())
                 add("androidMainImplementation", libs.findLibrary("koin.core.viewmodel").get())
 
-                add("androidTestImplementation", libs.findLibrary("koin.test.junit4").get())
-
-                add("androidInstrumentedTestImplementation", libs.findLibrary("androidx.navigation.testing").get())
-                add("androidInstrumentedTestImplementation", libs.findLibrary("androidx.compose.ui.test").get())
-                add("androidInstrumentedTestImplementation", libs.findLibrary("androidx.lifecycle.runtimeTesting").get())
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/build-logic/convention/src/main/kotlin/DetektConventionPlugin.kt b/build-logic/convention/src/main/kotlin/DetektConventionPlugin.kt
new file mode 100644
index 000000000..363f9df50
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/DetektConventionPlugin.kt
@@ -0,0 +1,26 @@
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.convention.configureDetekt
+import org.convention.detektGradle
+
+/**
+ * Plugin that applies the Detekt plugin and configures it.
+ */
+class DetektConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            applyPlugins()
+
+            detektGradle {
+                configureDetekt(this)
+            }
+        }
+    }
+
+    private fun Project.applyPlugins() {
+        pluginManager.apply {
+            apply("io.gitlab.arturbosch.detekt")
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/FieldSkippingClassVisitor.kt b/build-logic/convention/src/main/kotlin/FieldSkippingClassVisitor.kt
index b632c04fb..8074f3422 100644
--- a/build-logic/convention/src/main/kotlin/FieldSkippingClassVisitor.kt
+++ b/build-logic/convention/src/main/kotlin/FieldSkippingClassVisitor.kt
@@ -31,8 +31,8 @@ class FieldSkippingClassVisitor(
 
         override fun createClassVisitor(
             classContext: ClassContext,
-            nextClassVisitor: ClassVisitor,
-        ): ClassVisitor {
+            nextClassVisitor: org.objectweb.asm.ClassVisitor,
+        ): org.objectweb.asm.ClassVisitor {
             return FieldSkippingClassVisitor(
                 apiVersion = instrumentationContext.apiVersion.get(),
                 nextClassVisitor = nextClassVisitor,
diff --git a/build-logic/convention/src/main/kotlin/GitHooksConventionPlugin.kt b/build-logic/convention/src/main/kotlin/GitHooksConventionPlugin.kt
new file mode 100644
index 000000000..226e8d2d2
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/GitHooksConventionPlugin.kt
@@ -0,0 +1,57 @@
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.Exec
+import org.gradle.kotlin.dsl.register
+import java.util.Locale
+
+/**
+ * Plugin that installs the pre-commit git hooks from the scripts directory.
+ */
+class GitHooksConventionPlugin : Plugin<Project> {
+    override fun apply(project: Project) {
+        // Define a function to check if the OS is Linux or MacOS
+        fun isLinuxOrMacOs(): Boolean {
+            val osName = System.getProperty("os.name").lowercase(Locale.getDefault())
+            return osName.contains("linux") || osName.contains("mac os") || osName.contains("macos")
+        }
+
+        // Define the copyGitHooks task
+        project.tasks.register<Copy>("copyGitHooks") {
+            description = "Copies the git hooks from /scripts to the .git/hooks folder."
+            from("${project.rootDir}/scripts/") {
+                include("**/*.sh")
+                rename { it.removeSuffix(".sh") }
+            }
+            into("${project.rootDir}/.git/hooks")
+        }
+
+        // Define the installGitHooks task
+        project.tasks.register<Exec>("installGitHooks") {
+            description = "Installs the pre-commit git hooks from the scripts directory."
+            group = "git hooks"
+            workingDir = project.rootDir
+
+            if (isLinuxOrMacOs()) {
+                commandLine("chmod", "-R", "+x", ".git/hooks/")
+            }else {
+                commandLine("cmd", "/c", "attrib", "-R", "+X", ".git/hooks/*.*")
+            }
+            dependsOn(project.tasks.named("copyGitHooks"))
+
+            doLast {
+                println("Git hooks installed successfully.")
+            }
+        }
+
+        // Configure task dependencies after evaluation
+        project.afterEvaluate {
+            project.tasks.matching {
+                it.name in listOf("preBuild", "build", "assembleDebug", "assembleRelease", "installDebug", "installRelease", "clean")
+            }.configureEach {
+                dependsOn(project.tasks.named("installGitHooks"))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/KMPKoinConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KMPKoinConventionPlugin.kt
index 27c413da7..39149ccc4 100644
--- a/build-logic/convention/src/main/kotlin/KMPKoinConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/KMPKoinConventionPlugin.kt
@@ -1,15 +1,16 @@
-import com.google.devtools.ksp.gradle.KspExtension
+
+import org.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.mifos.mobile.libs
 
+/**
+ * Plugin that applies the Koin plugin and configures it.
+ */
 class KMPKoinConventionPlugin : Plugin<Project> {
-
     override fun apply(target: Project) {
-        with(target){
-            with(pluginManager){
+        with(target) {
+            with(pluginManager) {
                 apply("com.google.devtools.ksp")
             }
 
@@ -18,14 +19,9 @@ class KMPKoinConventionPlugin : Plugin<Project> {
                 add("commonMainImplementation", platform(bom))
                 add("commonMainImplementation", libs.findLibrary("koin.core").get())
                 add("commonMainImplementation", libs.findLibrary("koin.annotations").get())
-                add("kspCommonMainMetadata", libs.findLibrary("koin.ksp.compiler").get())
-                add("commonTestImplementation", libs.findLibrary("koin.test").get())
-            }
 
-            extensions.configure<KspExtension> {
-                arg("KOIN_CONFIG_CHECK","true")
+                add("commonTestImplementation", libs.findLibrary("koin.test").get())
             }
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/build-logic/convention/src/main/kotlin/KMPLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KMPLibraryConventionPlugin.kt
index 33aa493e6..8131dead7 100644
--- a/build-logic/convention/src/main/kotlin/KMPLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/KMPLibraryConventionPlugin.kt
@@ -1,35 +1,38 @@
+
 import com.android.build.gradle.LibraryExtension
+import org.convention.configureFlavors
+import org.convention.configureKotlinAndroid
+import org.convention.configureKotlinMultiplatform
+import org.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.mifos.mobile.configureFlavors
-import org.mifos.mobile.configureKotlinAndroid
-import org.mifos.mobile.configureKotlinMultiplatform
-import org.mifos.mobile.libs
-
-class KMPLibraryConventionPlugin : Plugin<Project> {
 
+/**
+ * Plugin that applies the Android library and Kotlin multiplatform plugins and configures them.
+ */
+class KMPLibraryConventionPlugin: Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
                 apply("com.android.library")
                 apply("org.jetbrains.kotlin.multiplatform")
                 apply("org.convention.kmp.koin")
-                apply("mifos.detekt.plugin")
-                apply("mifos.spotless.plugin")
+                apply("org.convention.detekt.plugin")
+                apply("org.convention.spotless.plugin")
+                apply("org.jetbrains.kotlin.plugin.serialization")
+                apply("org.jetbrains.kotlin.plugin.parcelize")
             }
 
             configureKotlinMultiplatform()
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 34
+                defaultConfig.targetSdk = 36
                 configureFlavors(this)
-                /**
-                 * The resource prefix is derived from the module name,
-                 * so resources inside ":core:module1" must be prefixed with "core_module1_"
-                 */
+                // The resource prefix is derived from the module name,
+                // so resources inside ":core:module1" must be prefixed with "core_module1_"
                 resourcePrefix = path
                     .split("""\W""".toRegex())
                     .drop(1).distinct()
@@ -38,6 +41,7 @@ class KMPLibraryConventionPlugin : Plugin<Project> {
             }
 
             dependencies {
+                add("commonMainImplementation", libs.findLibrary("kotlinx.serialization.json").get())
                 add("commonTestImplementation", libs.findLibrary("kotlin.test").get())
                 add("commonTestImplementation", libs.findLibrary("kotlinx.coroutines.test").get())
             }
diff --git a/build-logic/convention/src/main/kotlin/KMPRoomConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KMPRoomConventionPlugin.kt
index 6edd9041b..2a2de3ae9 100644
--- a/build-logic/convention/src/main/kotlin/KMPRoomConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/KMPRoomConventionPlugin.kt
@@ -1,10 +1,10 @@
 import androidx.room.gradle.RoomExtension
 import com.google.devtools.ksp.gradle.KspExtension
+import org.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.mifos.mobile.libs
 
 class KMPRoomConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -24,9 +24,8 @@ class KMPRoomConventionPlugin : Plugin<Project> {
             }
 
             dependencies {
-                "implementation"(libs.findLibrary("androidx.room.runtime").get())
-                "implementation"(libs.findLibrary("androidx.room.ktx").get())
                 // Adding ksp dependencies for multiple platforms
+                "implementation"(libs.findLibrary("androidx.room.ktx").get())
                 listOf(
                     "kspDesktop",
                     "kspAndroid",
@@ -36,8 +35,10 @@ class KMPRoomConventionPlugin : Plugin<Project> {
                     // Add any other platform you may support
                 ).forEach { platform ->
                     add(platform, libs.findLibrary("androidx.room.compiler").get())
+//                    Kotlin Extensions and Coroutines support for Room
+//                    add(platform, libs.findLibrary("androidx.room.ktx").get())
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/KeystoreManagementConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KeystoreManagementConventionPlugin.kt
new file mode 100644
index 000000000..381e41e77
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/KeystoreManagementConventionPlugin.kt
@@ -0,0 +1,153 @@
+import org.convention.keystore.ConfigurationFileUpdatesTask
+import org.convention.keystore.KeystoreConfig
+import org.convention.keystore.KeystoreGenerationTask
+import org.convention.keystore.SecretsConfig
+import org.convention.keystore.SecretsEnvUpdateTask
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+/**
+ * Convention plugin for keystore management following your existing patterns
+ */
+class KeystoreManagementConventionPlugin : Plugin<Project> {
+
+    override fun apply(target: Project) {
+        with(target) {
+            // Create extension for configuration
+            val keystoreExtension = extensions.create("keystoreManagement", KeystoreManagementExtension::class.java)
+
+            // Set default configurations
+            keystoreExtension.keystoreConfig.convention(KeystoreConfig())
+            keystoreExtension.secretsConfig.convention(SecretsConfig())
+
+            // Register the keystore generation task
+            val generateKeystoresTask = tasks.register("generateKeystores", KeystoreGenerationTask::class.java) {
+                // Configure task with extension values
+                keystoreConfig.set(keystoreExtension.keystoreConfig)
+                secretsConfig.set(keystoreExtension.secretsConfig)
+
+                // Load configuration from secrets.env if it exists
+                KeystoreGenerationTask.createWithSecretsConfig(this, keystoreExtension.secretsConfig.get())
+            }
+
+            // Register configuration file updates task
+            val updateConfigFilesTask = tasks.register("updateConfigurationFiles", ConfigurationFileUpdatesTask::class.java) {
+                // Load configuration from secrets.env if it exists
+                ConfigurationFileUpdatesTask.createWithSecretsConfig(this, keystoreExtension.secretsConfig.get())
+            }
+
+            // Register secrets.env update task (KMPPT-57)
+            val updateSecretsEnvTask = tasks.register("updateSecretsEnv", SecretsEnvUpdateTask::class.java) {
+                // Configure to use keystores from generation task
+                SecretsEnvUpdateTask.createFromKeystoreGeneration(this, generateKeystoresTask.get(), keystoreExtension.secretsConfig.get())
+            }
+
+            // Register combined task that generates keystores and updates config files
+            tasks.register("generateKeystoresAndUpdateConfigs", KeystoreGenerationTask::class.java) {
+                keystoreConfig.set(keystoreExtension.keystoreConfig)
+                secretsConfig.set(keystoreExtension.secretsConfig)
+
+                KeystoreGenerationTask.createWithSecretsConfig(this, keystoreExtension.secretsConfig.get())
+
+                // Configure the update tasks to run after this task
+                finalizedBy(updateConfigFilesTask)
+                finalizedBy(updateSecretsEnvTask)
+            }
+
+            // Configure the update task to use generated keystores
+            updateConfigFilesTask.configure {
+                // Set dependency on keystore generation
+                dependsOn(generateKeystoresTask)
+
+                // Configure to use upload keystore from generation task
+                ConfigurationFileUpdatesTask.createForUploadKeystore(this, generateKeystoresTask.get())
+            }
+
+            // Register convenience tasks for individual keystore types
+            tasks.register("generateOriginalKeystore", KeystoreGenerationTask::class.java) {
+                keystoreConfig.set(keystoreExtension.keystoreConfig)
+                secretsConfig.set(keystoreExtension.secretsConfig)
+                generateOriginal.set(true)
+                generateUpload.set(false)
+
+                KeystoreGenerationTask.createWithSecretsConfig(this, keystoreExtension.secretsConfig.get())
+            }
+
+            tasks.register("generateUploadKeystore", KeystoreGenerationTask::class.java) {
+                keystoreConfig.set(keystoreExtension.keystoreConfig)
+                secretsConfig.set(keystoreExtension.secretsConfig)
+                generateOriginal.set(false)
+                generateUpload.set(true)
+
+                KeystoreGenerationTask.createWithSecretsConfig(this, keystoreExtension.secretsConfig.get())
+            }
+
+            // Add task group description
+            tasks.register("keystoreHelp") {
+                group = "keystore"
+                description = "Shows available keystore management commands"
+                doLast {
+                    logger.lifecycle("""
+                        |Keystore Management Plugin - Available Tasks:
+                        |
+                        |Generation Tasks:
+                        |  - generateKeystores: Generate both ORIGINAL and UPLOAD keystores
+                        |  - generateOriginalKeystore: Generate only the ORIGINAL (debug) keystore
+                        |  - generateUploadKeystore: Generate only the UPLOAD (release) keystore
+                        |  - generateKeystoresAndUpdateConfigs: Generate keystores and update config files
+                        |
+                        |Configuration Update Tasks:
+                        |  - updateConfigurationFiles: Update fastlane and gradle config files with keystore info
+                        |  - updateSecretsEnv: Update secrets.env with base64-encoded keystores (KMPPT-57)
+                        |
+                        |Help Tasks:
+                        |  - keystoreHelp: Shows this help message
+                        |
+                        |Configuration:
+                        |  The plugin automatically loads configuration from 'secrets.env' if it exists.
+                        |  You can also configure manually in build.gradle.kts:
+                        |
+                        |  keystoreManagement {
+                        |    keystoreConfig {
+                        |      companyName = "Your Company Name"
+                        |      department = "Your Department"
+                        |      organization = "Your Organization"
+                        |      city = "Your City"
+                        |      state = "Your State"
+                        |      country = "US"
+                        |      keyAlgorithm = "RSA"
+                        |      keySize = 2048
+                        |      validity = 25
+                        |      overwriteExisting = false
+                        |    }
+                        |    secretsConfig {
+                        |      secretsEnvFile = file("secrets.env")
+                        |      preserveComments = true
+                        |      createBackup = true
+                        |    }
+                        |  }
+                        |
+                        |Usage Examples:
+                        |  ./gradlew generateKeystores                    # Generate both keystores
+                        |  ./gradlew generateOriginalKeystore             # Generate debug keystore only
+                        |  ./gradlew generateUploadKeystore               # Generate release keystore only
+                        |  ./gradlew generateKeystoresAndUpdateConfigs    # Generate keystores and update configs
+                        |  ./gradlew updateConfigurationFiles            # Update config files only
+                        |  ./gradlew updateSecretsEnv                    # Update secrets.env with base64 keystores
+                        |
+                        |Note: This task replicates the functionality of keystore-manager.sh
+                        |      with better cross-platform compatibility and Gradle integration.
+                    """.trimMargin())
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Extension class for keystore management configuration
+ */
+abstract class KeystoreManagementExtension {
+    abstract val keystoreConfig: org.gradle.api.provider.Property<KeystoreConfig>
+    abstract val secretsConfig: org.gradle.api.provider.Property<SecretsConfig>
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/KtlintConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KtlintConventionPlugin.kt
new file mode 100644
index 000000000..da7e3c06c
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/KtlintConventionPlugin.kt
@@ -0,0 +1,19 @@
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+/**
+ * Plugin that applies the Ktlint plugin and configures it.
+ */
+class KtlintConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            applyPlugins()
+        }
+    }
+
+    private fun Project.applyPlugins() {
+        pluginManager.apply {
+            apply("org.jlleitschuh.gradle.ktlint")
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt b/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt
new file mode 100644
index 000000000..771e67a20
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt
@@ -0,0 +1,25 @@
+import org.convention.configureSpotless
+import org.convention.spotlessGradle
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+/**
+ * Plugin that applies the Spotless plugin and configures it.
+ */
+class SpotlessConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            applyPlugins()
+
+            spotlessGradle {
+                configureSpotless(this)
+            }
+        }
+    }
+
+    private fun Project.applyPlugins() {
+        pluginManager.apply {
+            apply("com.diffplug.spotless")
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/org/convention/AndroidCompose.kt
new file mode 100644
index 000000000..ed68bb27b
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/AndroidCompose.kt
@@ -0,0 +1,63 @@
+package org.convention
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.Project
+import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
+
+/**
+ * Configure Compose-specific options
+ */
+internal fun Project.configureAndroidCompose(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+) {
+    commonExtension.apply {
+        buildFeatures {
+            compose = true
+        }
+
+        dependencies {
+            val bom = libs.findLibrary("androidx-compose-bom").get()
+            add("implementation", platform(bom))
+            add("androidTestImplementation", platform(bom))
+
+            add("implementation", libs.findLibrary("androidx-compose-ui-tooling-preview").get())
+            add("debugImplementation", libs.findLibrary("androidx-compose-ui-tooling").get())
+        }
+
+        testOptions {
+            unitTests {
+                // For Robolectric
+                isIncludeAndroidResources = true
+
+                isReturnDefaultValues = true
+
+                all {
+                    it.systemProperties["robolectric.pixelCopyRenderMode"] = "hardware"
+                }
+            }
+        }
+        
+    }
+
+    extensions.configure<ComposeCompilerGradlePluginExtension> {
+        fun Provider<String>.onlyIfTrue() = flatMap { provider { it.takeIf(String::toBoolean) } }
+        fun Provider<*>.relativeToRootProject(dir: String) = flatMap {
+            rootProject.layout.buildDirectory.dir(projectDir.toRelativeString(rootDir))
+        }.map { it.dir(dir) }
+
+        project.providers.gradleProperty("enableComposeCompilerMetrics").onlyIfTrue()
+            .relativeToRootProject("compose-metrics")
+            .let(metricsDestination::set)
+
+        project.providers.gradleProperty("enableComposeCompilerReports").onlyIfTrue()
+            .relativeToRootProject("compose-reports")
+            .let(reportsDestination::set)
+
+        stabilityConfigurationFiles
+            .add(isolated.rootProject.projectDirectory.file("compose_compiler_config.conf"))
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/AndroidInstrumentedTests.kt b/build-logic/convention/src/main/kotlin/org/convention/AndroidInstrumentedTests.kt
new file mode 100644
index 000000000..e6688d580
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/AndroidInstrumentedTests.kt
@@ -0,0 +1,19 @@
+package org.convention
+
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import org.gradle.api.Project
+
+/**
+ * Disable unnecessary Android instrumented tests for the [project] if there is no `androidTest` folder.
+ * Otherwise, these projects would be compiled, packaged, installed and ran only to end-up with the following message:
+ *
+ * > Starting 0 tests on AVD
+ *
+ * Note: this could be improved by checking other potential sourceSets based on buildTypes and flavors.
+ */
+internal fun LibraryAndroidComponentsExtension.disableUnnecessaryAndroidTests(
+    project: Project,
+) = beforeVariants {
+    it.enableAndroidTest = it.enableAndroidTest
+        && project.projectDir.resolve("src/androidTest").exists()
+}
diff --git a/build-logic/convention/src/main/kotlin/org/convention/AppBuildType.kt b/build-logic/convention/src/main/kotlin/org/convention/AppBuildType.kt
new file mode 100644
index 000000000..a663be520
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/AppBuildType.kt
@@ -0,0 +1,9 @@
+package org.convention
+
+/**
+ * This is shared between :app and :benchmarks module to provide configurations type safety.
+ */
+enum class AppBuildType(val applicationIdSuffix: String? = null) {
+    DEBUG(".debug"),
+    RELEASE,
+}
diff --git a/build-logic/convention/src/main/kotlin/org/convention/AppFlavor.kt b/build-logic/convention/src/main/kotlin/org/convention/AppFlavor.kt
new file mode 100644
index 000000000..095a42f78
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/AppFlavor.kt
@@ -0,0 +1,48 @@
+package org.convention
+
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.ApplicationProductFlavor
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.ProductFlavor
+
+@Suppress("EnumEntryName")
+enum class FlavorDimension {
+    contentType
+}
+
+// The content for the app can either come from local static data which is useful for demo
+// purposes, or from a production backend server which supplies up-to-date, real content.
+// These two product flavors reflect this behaviour.
+@Suppress("EnumEntryName")
+enum class AppFlavor(val dimension: FlavorDimension, val applicationIdSuffix: String? = null) {
+    demo(FlavorDimension.contentType, applicationIdSuffix = ".demo"),
+    prod(FlavorDimension.contentType)
+}
+
+/**
+ * Configure product flavors for the app module
+ * @param commonExtension the common extension for the app module
+ * @param flavorConfigurationBlock the configuration block for each flavor
+ * @see AppFlavor
+ */
+fun configureFlavors(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+    flavorConfigurationBlock: ProductFlavor.(flavor: AppFlavor) -> Unit = {},
+) {
+    commonExtension.apply {
+        flavorDimensions += FlavorDimension.contentType.name
+        productFlavors {
+            AppFlavor.values().forEach {
+                create(it.name) {
+                    dimension = it.dimension.name
+                    flavorConfigurationBlock(this, it)
+                    if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {
+                        if (it.applicationIdSuffix != null) {
+                            applicationIdSuffix = it.applicationIdSuffix
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/org/convention/Badging.kt b/build-logic/convention/src/main/kotlin/org/convention/Badging.kt
new file mode 100644
index 000000000..bc5c5a0a9
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/Badging.kt
@@ -0,0 +1,156 @@
+package org.convention
+
+import com.android.build.api.artifact.SingleArtifact
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.gradle.BaseExtension
+import com.android.SdkConstants
+import com.google.common.truth.Truth.assertWithMessage
+import org.gradle.api.DefaultTask
+import org.gradle.api.Project
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+import org.gradle.configurationcache.extensions.capitalized
+import org.gradle.kotlin.dsl.register
+import org.gradle.language.base.plugins.LifecycleBasePlugin
+import org.gradle.process.ExecOperations
+import java.io.File
+import java.util.Locale
+import javax.inject.Inject
+
+/**
+ * Generates the badging information of the APK.
+ * This task is cacheable, meaning that if the inputs and outputs have not changed,
+ * the task will be considered up-to-date and will not run.
+ * This task is also incremental, meaning that if the inputs have not changed,
+ *
+ */
+@CacheableTask
+abstract class GenerateBadgingTask : DefaultTask() {
+
+    @get:OutputFile
+    abstract val badging: RegularFileProperty
+
+    @get:PathSensitive(PathSensitivity.NONE)
+    @get:InputFile
+    abstract val apk: RegularFileProperty
+
+    @get:PathSensitive(PathSensitivity.NONE)
+    @get:InputFile
+    abstract val aapt2Executable: RegularFileProperty
+
+    @get:Inject
+    abstract val execOperations: ExecOperations
+
+    @TaskAction
+    fun taskAction() {
+        execOperations.exec {
+            commandLine(
+                aapt2Executable.get().asFile.absolutePath,
+                "dump",
+                "badging",
+                apk.get().asFile.absolutePath,
+            )
+            standardOutput = badging.asFile.get().outputStream()
+        }
+    }
+}
+
+@CacheableTask
+abstract class CheckBadgingTask : DefaultTask() {
+
+    // In order for the task to be up-to-date when the inputs have not changed,
+    // the task must declare an output, even if it's not used. Tasks with no
+    // output are always run regardless of whether the inputs changed
+    @get:OutputDirectory
+    abstract val output: DirectoryProperty
+
+    @get:PathSensitive(PathSensitivity.NONE)
+    @get:InputFile
+    abstract val goldenBadging: RegularFileProperty
+
+    @get:PathSensitive(PathSensitivity.NONE)
+    @get:InputFile
+    abstract val generatedBadging: RegularFileProperty
+
+    @get:Input
+    abstract val updateBadgingTaskName: Property<String>
+
+    override fun getGroup(): String = LifecycleBasePlugin.VERIFICATION_GROUP
+
+    @TaskAction
+    fun taskAction() {
+        assertWithMessage(
+            "Generated badging is different from golden badging! " +
+                    "If this change is intended, run ./gradlew ${updateBadgingTaskName.get()}",
+        )
+            .that(generatedBadging.get().asFile.readText())
+            .isEqualTo(goldenBadging.get().asFile.readText())
+    }
+}
+
+fun Project.configureBadgingTasks(
+    baseExtension: BaseExtension,
+    componentsExtension: ApplicationAndroidComponentsExtension,
+) {
+    // Registers a callback to be called, when a new variant is configured
+    componentsExtension.onVariants { variant ->
+        // Registers a new task to verify the app bundle.
+        val capitalizedVariantName = variant.name.let {
+            if (it.isEmpty()) it else it[0].titlecase(
+                Locale.getDefault(),
+            ) + it.substring(1)
+        }
+        val generateBadgingTaskName = "generate${capitalizedVariantName}Badging"
+        val generateBadging =
+            tasks.register<GenerateBadgingTask>(generateBadgingTaskName) {
+                apk.set(
+                    variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE),
+                )
+                aapt2Executable.set(
+                    File(
+                        baseExtension.sdkDirectory,
+                        "${SdkConstants.FD_BUILD_TOOLS}/" +
+                                "${baseExtension.buildToolsVersion}/" +
+                                SdkConstants.FN_AAPT2,
+                    ),
+                )
+
+                badging.set(
+                    project.layout.buildDirectory.file(
+                        "outputs/apk_from_bundle/${variant.name}/${variant.name}-badging.txt",
+                    ),
+                )
+            }
+
+        val updateBadgingTaskName = "update${capitalizedVariantName}Badging"
+        tasks.register<Copy>(updateBadgingTaskName) {
+            from(generateBadging.get().badging)
+            into(project.layout.projectDirectory)
+        }
+
+        val checkBadgingTaskName = "check${capitalizedVariantName}Badging"
+        tasks.register<CheckBadgingTask>(checkBadgingTaskName) {
+            goldenBadging.set(
+                project.layout.projectDirectory.file("${variant.name}-badging.txt"),
+            )
+            generatedBadging.set(
+                generateBadging.get().badging,
+            )
+            this.updateBadgingTaskName.set(updateBadgingTaskName)
+
+            output.set(
+                project.layout.buildDirectory.dir("intermediates/$checkBadgingTaskName"),
+            )
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/org/convention/Detekt.kt b/build-logic/convention/src/main/kotlin/org/convention/Detekt.kt
new file mode 100644
index 000000000..0844153b4
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/Detekt.kt
@@ -0,0 +1,43 @@
+package org.convention
+
+import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.named
+
+/**
+ * Configures the Detekt plugin with the [extension] configuration.
+ * This includes setting the JVM target to 17 and enabling all reports.
+ * Additionally, it adds the `detekt-formatting` and `twitter-detekt-compose` plugins.
+ * @see DetektExtension
+ * @see Detekt
+ */
+internal fun Project.configureDetekt(extension: DetektExtension) = extension.apply {
+    tasks.named<Detekt>("detekt") {
+        mustRunAfter(":cmp-android:dependencyGuard")
+        jvmTarget = "17"
+        source(files(rootDir))
+        include("**/*.kt")
+        exclude("**/*.kts")
+        exclude("**/resources/**")
+        exclude("**/build/**")
+        exclude("**/generated/**")
+        exclude("**/build-logic/**")
+        exclude("**/spotless/**")
+        // TODO:: Remove this exclusion
+        exclude("core-base/designsystem/**")
+        exclude("feature/home/**")
+        reports {
+            xml.required.set(true)
+            html.required.set(true)
+            txt.required.set(true)
+            sarif.required.set(true)
+            md.required.set(true)
+        }
+    }
+    dependencies {
+        "detektPlugins"(libs.findLibrary("detekt-formatting").get())
+        "detektPlugins"(libs.findLibrary("twitter-detekt-compose").get())
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/GradleManagedDevices.kt b/build-logic/convention/src/main/kotlin/org/convention/GradleManagedDevices.kt
new file mode 100644
index 000000000..202838ec6
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/GradleManagedDevices.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+package org.convention
+
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.api.dsl.ManagedVirtualDevice
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.invoke
+
+/**
+ * Configure project for Gradle managed devices
+ */
+internal fun configureGradleManagedDevices(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+) {
+    val pixel4 = DeviceConfig("Pixel 4", 30, "aosp-atd")
+    val pixel6 = DeviceConfig("Pixel 6", 31, "aosp")
+    val pixelC = DeviceConfig("Pixel C", 30, "aosp-atd")
+
+    val localDevices = listOf(pixel4, pixel6, pixelC)
+    val ciDevices = listOf(pixel4, pixelC)
+
+    commonExtension.testOptions {
+        managedDevices {
+            allDevices {
+                localDevices.forEach { deviceConfig ->
+                    maybeCreate(deviceConfig.taskName, ManagedVirtualDevice::class.java).apply {
+                        device = deviceConfig.device
+                        apiLevel = deviceConfig.apiLevel
+                        systemImageSource = deviceConfig.systemImageSource
+                    }
+                }
+            }
+            groups {
+                maybeCreate("ci").apply {
+                    ciDevices.forEach { deviceConfig ->
+                        targetDevices.add(allDevices[deviceConfig.taskName])
+                    }
+                }
+            }
+        }
+    }
+}
+
+private data class DeviceConfig(
+    val device: String,
+    val apiLevel: Int,
+    val systemImageSource: String,
+) {
+    val taskName = buildString {
+        append(device.lowercase().replace(" ", ""))
+        append("api")
+        append(apiLevel.toString())
+        append(systemImageSource.replace("-", ""))
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/org/convention/HierarchyTemplate.kt b/build-logic/convention/src/main/kotlin/org/convention/HierarchyTemplate.kt
new file mode 100644
index 000000000..db72fb947
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/HierarchyTemplate.kt
@@ -0,0 +1,179 @@
+/**
+ * Kotlin Multiplatform project hierarchy template configuration.
+ *
+ * This file defines a structured hierarchy for organizing source sets in Kotlin Multiplatform
+ * projects. It establishes a logical grouping of platform targets that enables efficient code
+ * sharing across platforms with similar characteristics.
+ *
+ * The hierarchy template creates the following logical groupings:
+ * - `common`: Base shared code for all platforms
+ * - `nonAndroid`: Code shared between JVM, JS, and native platforms, excluding Android
+ * - `jsCommon`: Code shared between JavaScript and WebAssembly JavaScript targets
+ * - `nonJsCommon`: Code shared between JVM and native platforms, excluding JS platforms
+ * - `jvmCommon`: Code shared between Android and JVM targets
+ * - `nonJvmCommon`: Code shared between JS and native platforms, excluding JVM platforms
+ * - `native`: Code shared across all native platforms
+ *   - `apple`: Code shared across Apple platforms (iOS, macOS)
+ *     - `ios`: iOS-specific code
+ *     - `macos`: macOS-specific code
+ * - `nonNative`: Code shared between JS and JVM platforms
+ *
+ * This template applies to both main and test source sets, establishing a consistent
+ * structure throughout the project.
+ *
+ * Note: This implementation uses experimental Kotlin Gradle plugin APIs and may be subject
+ * to change in future Kotlin releases.
+ */
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+package org.convention
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinHierarchyBuilder
+import org.jetbrains.kotlin.gradle.plugin.KotlinHierarchyTemplate
+import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
+
+/**
+ * Defines the hierarchical structure for source set organization.
+ *
+ * This template establishes the relationships between different platform targets,
+ * creating logical groupings based on platform similarities to facilitate code sharing.
+ */
+private val hierarchyTemplate = KotlinHierarchyTemplate {
+    withSourceSetTree(
+        KotlinSourceSetTree.main,
+        KotlinSourceSetTree.test,
+    )
+
+    common {
+        withCompilations { true }
+
+        groupNonAndroid()
+        groupJsCommon()
+        groupNonJsCommon()
+        groupJvmCommon()
+        groupNonJvmCommon()
+        groupNative()
+        groupNonNative()
+        groupJvmJsCommon()
+        groupMobile()
+    }
+}
+
+/**
+ * Creates a group of non-Android platforms (JVM, JS, and native).
+ */
+private fun KotlinHierarchyBuilder.groupNonAndroid() {
+    group("nonAndroid") {
+        withJvm()
+        groupJsCommon()
+        groupNative()
+    }
+}
+
+/**
+ * Creates a group of JavaScript-related platforms (JS and WebAssembly JS).
+ */
+private fun KotlinHierarchyBuilder.groupJsCommon() {
+    group("jsCommon") {
+        withJs()
+        withWasmJs()
+    }
+}
+
+/**
+ * Creates a group of non-JavaScript platforms (JVM-based and native).
+ */
+private fun KotlinHierarchyBuilder.groupNonJsCommon() {
+    group("nonJsCommon") {
+        groupJvmCommon()
+        groupNative()
+    }
+}
+
+/**
+ * Creates a group of JVM-based platforms (Android and JVM).
+ */
+private fun KotlinHierarchyBuilder.groupJvmCommon() {
+    group("jvmCommon") {
+        withAndroidTarget()
+        withJvm()
+    }
+}
+
+/**
+ * Creates a group of non-JVM platforms (JavaScript and native).
+ */
+private fun KotlinHierarchyBuilder.groupNonJvmCommon() {
+    group("nonJvmCommon") {
+        groupJsCommon()
+        groupNative()
+    }
+}
+
+/**
+ * Creates a group of JVM, JS platforms (JavaScript and JVM).
+ */
+private fun KotlinHierarchyBuilder.groupJvmJsCommon() {
+    group("jvmJsCommon") {
+        groupJsCommon()
+        withJvm()
+    }
+}
+
+/**
+ * Creates a hierarchical group of native platforms with subgroups for Apple platforms.
+ */
+private fun KotlinHierarchyBuilder.groupNative() {
+    group("native") {
+        withNative()
+
+        group("apple") {
+            withApple()
+
+            group("ios") {
+                withIos()
+            }
+
+            group("macos") {
+                withMacos()
+            }
+        }
+    }
+}
+
+/**
+ * Creates a group of non-native platforms (JavaScript and JVM-based).
+ */
+private fun KotlinHierarchyBuilder.groupNonNative() {
+    group("nonNative") {
+        groupJsCommon()
+        groupJvmCommon()
+    }
+}
+
+private fun KotlinHierarchyBuilder.groupMobile() {
+    group("mobile") {
+        withAndroidTarget()
+        withApple()
+    }
+}
+
+/**
+ * Applies the predefined hierarchy template to a Kotlin Multiplatform project.
+ *
+ * This extension function should be called within the `kotlin` block of a Multiplatform
+ * project's build script to establish the source set hierarchy defined in this file.
+ *
+ * Example usage:
+ * ```
+ * kotlin {
+ *     applyProjectHierarchyTemplate()
+ *     // Configure targets...
+ * }
+ * ```
+ */
+fun KotlinMultiplatformExtension.applyProjectHierarchyTemplate() {
+    applyHierarchyTemplate(hierarchyTemplate)
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/Jacoco.kt b/build-logic/convention/src/main/kotlin/org/convention/Jacoco.kt
new file mode 100644
index 000000000..6f4dbd383
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/Jacoco.kt
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.convention
+
+import com.android.build.api.artifact.ScopedArtifact
+import com.android.build.api.variant.AndroidComponentsExtension
+import com.android.build.api.variant.ScopedArtifacts
+import com.android.build.api.variant.SourceDirectories
+import org.gradle.api.Project
+import org.gradle.api.file.Directory
+import org.gradle.api.file.RegularFile
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.testing.Test
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.register
+import org.gradle.kotlin.dsl.withType
+import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
+import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
+import org.gradle.testing.jacoco.tasks.JacocoReport
+import java.util.Locale
+
+private val coverageExclusions = listOf(
+    // Android
+    "**/R.class",
+    "**/R\$*.class",
+    "**/BuildConfig.*",
+    "**/Manifest*.*",
+    "**/*_Hilt*.class",
+    "**/Hilt_*.class",
+)
+
+private fun String.capitalize() = replaceFirstChar {
+    if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
+}
+
+/**
+ * Creates a new task that generates a combined coverage report with data from local and
+ * instrumented tests.
+ *
+ * `create{variant}CombinedCoverageReport`
+ *
+ * Note that coverage data must exist before running the task. This allows us to run device
+ * tests on CI using a different Github Action or an external device farm.
+ */
+internal fun Project.configureJacoco(
+    androidComponentsExtension: AndroidComponentsExtension<*, *, *>,
+) {
+    configure<JacocoPluginExtension> {
+        toolVersion = libs.findVersion("jacoco").get().toString()
+    }
+
+    androidComponentsExtension.onVariants { variant ->
+        val myObjFactory = project.objects
+        val buildDir = layout.buildDirectory.get().asFile
+        val allJars: ListProperty<RegularFile> = myObjFactory.listProperty(RegularFile::class.java)
+        val allDirectories: ListProperty<Directory> =
+            myObjFactory.listProperty(Directory::class.java)
+        val reportTask =
+            tasks.register(
+                "create${variant.name.capitalize()}CombinedCoverageReport",
+                JacocoReport::class,
+            ) {
+
+                classDirectories.setFrom(
+                    allJars,
+                    allDirectories.map { dirs ->
+                        dirs.map { dir ->
+                            myObjFactory.fileTree().setDir(dir).exclude(coverageExclusions)
+                        }
+                    },
+                )
+                reports {
+                    xml.required = true
+                    html.required = true
+                }
+
+                fun SourceDirectories.Flat?.toFilePaths(): Provider<List<String>> = this
+                    ?.all
+                    ?.map { directories -> directories.map { it.asFile.path } }
+                    ?: provider { emptyList() }
+                sourceDirectories.setFrom(
+                    files(
+                        variant.sources.java.toFilePaths(),
+                        variant.sources.kotlin.toFilePaths()
+                    ),
+                )
+
+                executionData.setFrom(
+                    project.fileTree("$buildDir/outputs/unit_test_code_coverage/${variant.name}UnitTest")
+                        .matching { include("**/*.exec") },
+
+                    project.fileTree("$buildDir/outputs/code_coverage/${variant.name}AndroidTest")
+                        .matching { include("**/*.ec") },
+                )
+            }
+
+
+        variant.artifacts.forScope(ScopedArtifacts.Scope.PROJECT)
+            .use(reportTask)
+            .toGet(
+                ScopedArtifact.CLASSES,
+                { _ -> allJars },
+                { _ -> allDirectories },
+            )
+    }
+
+    tasks.withType<Test>().configureEach {
+        configure<JacocoTaskExtension> {
+            // Required for JaCoCo + Robolectric
+            // https://github.com/robolectric/robolectric/issues/2230
+            isIncludeNoLocationClasses = true
+
+            // Required for JDK 11 with the above
+            // https://github.com/gradle/gradle/issues/5184#issuecomment-391982009
+            excludes = listOf("jdk.internal.*")
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/org/convention/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/org/convention/KotlinAndroid.kt
new file mode 100644
index 000000000..fe40731b7
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/KotlinAndroid.kt
@@ -0,0 +1,77 @@
+package org.convention
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+/**
+ * Configure base Kotlin with Android options
+ */
+internal fun Project.configureKotlinAndroid(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+) {
+    commonExtension.apply {
+        compileSdk = 36
+
+        defaultConfig {
+            minSdk = 26
+        }
+
+        compileOptions {
+            // Up to Java 11 APIs are available through desugaring
+            // https://developer.android.com/studio/write/java11-minimal-support-table
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+            isCoreLibraryDesugaringEnabled = true
+        }
+    }
+
+    configureKotlin()
+
+    dependencies {
+        add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
+    }
+}
+
+/**
+ * Configure base Kotlin options for JVM (non-Android)
+ */
+internal fun Project.configureKotlinJvm() {
+    extensions.configure<JavaPluginExtension> {
+        // Up to Java 11 APIs are available through desugaring
+        // https://developer.android.com/studio/write/java11-minimal-support-table
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    configureKotlin()
+}
+
+/**
+ * Configure base Kotlin options
+ */
+private fun Project.configureKotlin() {
+    // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
+    tasks.withType<KotlinCompile>().configureEach {
+        compilerOptions {
+            // Set JVM target to 17
+            jvmTarget = JvmTarget.JVM_17
+            // Treat all Kotlin warnings as errors (disabled by default)
+            // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
+            val warningsAsErrors: String? by project
+            allWarningsAsErrors = warningsAsErrors.toBoolean()
+            freeCompilerArgs.add(
+                // Enable experimental coroutines APIs, including Flow
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/KotlinMultiplatform.kt b/build-logic/convention/src/main/kotlin/org/convention/KotlinMultiplatform.kt
new file mode 100644
index 000000000..4ff2e48d4
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/KotlinMultiplatform.kt
@@ -0,0 +1,40 @@
+package org.convention
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+/**
+ * Configure the Kotlin Multiplatform plugin with the default hierarchy template and additional targets.
+ * This includes JVM, Android, iOS, JS and WASM targets.
+ * @see KotlinMultiplatformExtension
+ * @see configure
+ */
+@OptIn(ExperimentalWasmDsl::class, ExperimentalKotlinGradlePluginApi::class)
+internal fun Project.configureKotlinMultiplatform() {
+    extensions.configure<KotlinMultiplatformExtension> {
+        applyProjectHierarchyTemplate()
+
+        jvm("desktop")
+        androidTarget()
+        iosSimulatorArm64()
+        iosX64()
+        iosArm64()
+        js(IR) {
+            this.nodejs()
+            binaries.executable()
+        }
+        wasmJs() {
+            browser()
+            nodejs()
+        }
+
+        compilerOptions {
+            freeCompilerArgs.add("-Xexpect-actual-classes")
+            freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+            freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/PrintTestApks.kt b/build-logic/convention/src/main/kotlin/org/convention/PrintTestApks.kt
new file mode 100644
index 000000000..d95410bb8
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/PrintTestApks.kt
@@ -0,0 +1,95 @@
+package org.convention
+
+import com.android.build.api.artifact.SingleArtifact
+import com.android.build.api.variant.AndroidComponentsExtension
+import com.android.build.api.variant.BuiltArtifactsLoader
+import com.android.build.api.variant.HasAndroidTest
+import org.gradle.api.DefaultTask
+import org.gradle.api.Project
+import org.gradle.api.file.Directory
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+import org.gradle.work.DisableCachingByDefault
+import java.io.File
+
+/**
+ * Configures the `printTestApks` task for the [project].
+ * This task will print the location of the androidTest APKs.
+ * This is useful when running tests on a device or emulator.
+ * The task will only be created if there are androidTest sources.
+ * @see PrintApkLocationTask
+ * @see HasAndroidTest
+ */
+internal fun Project.configurePrintApksTask(extension: AndroidComponentsExtension<*, *, *>) {
+    extension.onVariants { variant ->
+        if (variant is HasAndroidTest) {
+            val loader = variant.artifacts.getBuiltArtifactsLoader()
+            val artifact = variant.androidTest?.artifacts?.get(SingleArtifact.APK)
+            val javaSources = variant.androidTest?.sources?.java?.all
+            val kotlinSources = variant.androidTest?.sources?.kotlin?.all
+
+            val testSources = if (javaSources != null && kotlinSources != null) {
+                javaSources.zip(kotlinSources) { javaDirs, kotlinDirs ->
+                    javaDirs + kotlinDirs
+                }
+            } else javaSources ?: kotlinSources
+
+            if (artifact != null && testSources != null) {
+                tasks.register(
+                    "${variant.name}PrintTestApk",
+                    PrintApkLocationTask::class.java,
+                ) {
+                    apkFolder.set(artifact)
+                    builtArtifactsLoader.set(loader)
+                    variantName.set(variant.name)
+                    sources.set(testSources)
+                }
+            }
+        }
+    }
+}
+
+@DisableCachingByDefault(because = "Prints output")
+internal abstract class PrintApkLocationTask : DefaultTask() {
+
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    @get:InputDirectory
+    abstract val apkFolder: DirectoryProperty
+
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    @get:InputFiles
+    abstract val sources: ListProperty<Directory>
+
+    @get:Internal
+    abstract val builtArtifactsLoader: Property<BuiltArtifactsLoader>
+
+    @get:Input
+    abstract val variantName: Property<String>
+
+    @TaskAction
+    fun taskAction() {
+        val hasFiles = sources.orNull?.any { directory ->
+            directory.asFileTree.files.any {
+                it.isFile && "build${File.separator}generated" !in it.parentFile.path
+            }
+        } ?: throw RuntimeException("Cannot check androidTest sources")
+
+        // Don't print APK location if there are no androidTest source files
+        if (!hasFiles) return
+
+        val builtArtifacts = builtArtifactsLoader.get().load(apkFolder.get())
+            ?: throw RuntimeException("Cannot load APKs")
+        if (builtArtifacts.elements.size != 1)
+            throw RuntimeException("Expected one APK !")
+        val apk = File(builtArtifacts.elements.single().outputFile).toPath()
+        println(apk)
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/ProjectExtensions.kt b/build-logic/convention/src/main/kotlin/org/convention/ProjectExtensions.kt
new file mode 100644
index 000000000..8b05d6ee0
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/ProjectExtensions.kt
@@ -0,0 +1,39 @@
+package org.convention
+
+import com.diffplug.gradle.spotless.SpotlessExtension
+import io.gitlab.arturbosch.detekt.extensions.DetektExtension
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.getByType
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.plugin.KotlinHierarchyBuilder
+
+/**
+ * Get the `libs` version catalog.
+ */
+val Project.libs
+    get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+/**
+ * Get the dynamic version of the project.
+ */
+val Project.dynamicVersion
+    get() = project.version.toString().split('+')[0]
+
+/**
+ * Configures the `detekt` plugin with the [configure] lambda.
+ */
+inline fun Project.detektGradle(crossinline configure: DetektExtension.() -> Unit) =
+    extensions.configure<DetektExtension> {
+        configure()
+    }
+
+/**
+ * Configures the `spotless` plugin with the [configure] lambda.
+ */
+inline fun Project.spotlessGradle(crossinline configure: SpotlessExtension.() -> Unit) =
+    extensions.configure<SpotlessExtension> {
+        configure()
+    }
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/Spotless.kt b/build-logic/convention/src/main/kotlin/org/convention/Spotless.kt
new file mode 100644
index 000000000..8a29e1d7f
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/Spotless.kt
@@ -0,0 +1,36 @@
+package org.convention
+
+import com.diffplug.gradle.spotless.SpotlessExtension
+import org.gradle.api.Project
+
+const val ktlintVersion = "1.0.1"
+
+/**
+ * Configures the Spotless plugin with the [extension] configuration.
+ * This includes setting up the `ktlint` formatter and the license header.
+ * @see SpotlessExtension
+ */
+internal fun Project.configureSpotless(extension: SpotlessExtension) = extension.apply {
+    kotlin {
+        target("**/*.kt")
+        targetExclude("**/build/**/*.kt")
+        ktlint(ktlintVersion).editorConfigOverride(
+            mapOf("android" to "true"),
+        )
+        licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
+    }
+
+    format("kts") {
+        target("**/*.kts")
+        targetExclude("**/build/**/*.kts")
+        // Look for the first line that doesn't have a block comment (assumed to be the license)
+        licenseHeaderFile(rootProject.file("spotless/copyright.kts"), "(^(?![\\/ ]\\*).*$)")
+    }
+
+    format("xml") {
+        target("**/*.xml")
+        targetExclude("**/build/**/*.xml")
+        // Look for the first XML tag that isn't a comment (<!--) or the xml declaration (<?xml)
+        licenseHeaderFile(rootProject.file("spotless/copyright.xml"), "(<[^!?])")
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/BaseKeystoreTask.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/BaseKeystoreTask.kt
new file mode 100644
index 000000000..30455e172
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/BaseKeystoreTask.kt
@@ -0,0 +1,97 @@
+package org.convention.keystore
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import org.gradle.work.DisableCachingByDefault
+import java.io.File
+
+/**
+ * Base class for keystore management tasks following your existing convention patterns
+ */
+@DisableCachingByDefault(because = "Keystore generation is not a cacheable task")
+abstract class BaseKeystoreTask : DefaultTask() {
+
+    @get:Input
+    @get:Optional
+    abstract val keystoreConfig: Property<KeystoreConfig>
+
+    @get:Input
+    @get:Optional
+    abstract val secretsConfig: Property<SecretsConfig>
+
+    init {
+        group = "keystore"
+        description = "Base task for keystore management operations"
+
+        // Set default configurations
+        keystoreConfig.convention(KeystoreConfig())
+        secretsConfig.convention(SecretsConfig())
+    }
+
+    /**
+     * Logs task execution with consistent formatting
+     */
+    protected fun logInfo(message: String) {
+        logger.lifecycle("[KEYSTORE] $message")
+    }
+
+    protected fun logWarning(message: String) {
+        logger.warn("[KEYSTORE] $message")
+    }
+
+    protected fun logError(message: String) {
+        logger.error("[KEYSTORE] $message")
+    }
+
+    /**
+     * Validates configurations before task execution
+     */
+    protected fun validateConfiguration(): Boolean {
+        val keystoreErrors = keystoreConfig.get().validate()
+        if (keystoreErrors.isNotEmpty()) {
+            logError("Keystore configuration errors:")
+            keystoreErrors.forEach { logError("  - $it") }
+            return false
+        }
+        return true
+    }
+
+    /**
+     * Creates directory if it doesn't exist
+     */
+    protected fun ensureDirectoryExists(directory: File): Boolean {
+        return if (!directory.exists()) {
+            val created = directory.mkdirs()
+            if (created) {
+                logInfo("Created directory: ${directory.absolutePath}")
+            } else {
+                logError("Failed to create directory: ${directory.absolutePath}")
+            }
+            created
+        } else {
+            true
+        }
+    }
+
+    /**
+     * Checks if keytool is available (matches script check_keytool function)
+     */
+    protected fun checkKeytoolAvailable(): Boolean {
+        return try {
+            val process = ProcessBuilder("keytool", "-help").start()
+            val exitCode = process.waitFor()
+            if (exitCode == 0) {
+                logInfo("keytool is available")
+                true
+            } else {
+                logError("keytool command failed")
+                false
+            }
+        } catch (e: Exception) {
+            logError("keytool not found. Please ensure JDK is installed and keytool is in PATH")
+            false
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/ConfigurationFileUpdatesTask.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/ConfigurationFileUpdatesTask.kt
new file mode 100644
index 000000000..7f30aa615
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/ConfigurationFileUpdatesTask.kt
@@ -0,0 +1,347 @@
+package org.convention.keystore
+
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+import org.gradle.work.DisableCachingByDefault
+import java.io.File
+
+/**
+ * Gradle task for updating configuration files with keystore information
+ *
+ * This task replicates the functionality of the keystore-manager.sh script's
+ * update_fastlane_config and update_gradle_config functions, providing native
+ * Gradle DSL support for updating configuration files after keystore generation.
+ */
+@DisableCachingByDefault(because = "Configuration file updates should always run")
+abstract class ConfigurationFileUpdatesTask : BaseKeystoreTask() {
+
+    @get:Input
+    abstract val uploadKeystoreConfig: Property<KeystoreConfig>
+
+    @get:Input
+    @get:Optional
+    abstract val fastlaneConfigPath: Property<String>
+
+    @get:Input
+    @get:Optional
+    abstract val gradleBuildPath: Property<String>
+
+    @get:Input
+    @get:Optional
+    abstract val updateFastlane: Property<Boolean>
+
+    @get:Input
+    @get:Optional
+    abstract val updateGradle: Property<Boolean>
+
+    @get:InputFile
+    @get:Optional
+    @get:PathSensitive(PathSensitivity.ABSOLUTE)
+    abstract val uploadKeystoreFile: RegularFileProperty
+
+    init {
+        description = "Updates configuration files (fastlane and gradle) with keystore information"
+
+        // Set default values
+        fastlaneConfigPath.convention("fastlane-config/android_config.rb")
+        gradleBuildPath.convention("cmp-android/build.gradle.kts")
+        updateFastlane.convention(true)
+        updateGradle.convention(true)
+        uploadKeystoreConfig.convention(KeystoreConfig.upload())
+    }
+
+    @TaskAction
+    fun updateConfigurationFiles() {
+        logInfo("Starting configuration file updates task")
+
+        val config = uploadKeystoreConfig.get()
+        val keystoreFile = uploadKeystoreFile.orNull?.asFile
+
+        // Validate keystore configuration
+        val validationErrors = config.validate()
+        if (validationErrors.isNotEmpty()) {
+            throw IllegalArgumentException("Invalid keystore configuration: ${validationErrors.joinToString(", ")}")
+        }
+
+        var fastlaneUpdated = false
+        var gradleUpdated = false
+
+        // Update fastlane configuration if requested
+        if (updateFastlane.get()) {
+            val fastlaneFile = File(project.rootDir, fastlaneConfigPath.get())
+            try {
+                updateFastlaneConfig(fastlaneFile, config, keystoreFile)
+                fastlaneUpdated = true
+                logInfo("Fastlane configuration updated successfully")
+            } catch (e: Exception) {
+                logError("Failed to update fastlane configuration: ${e.message}")
+                throw e
+            }
+        }
+
+        // Update gradle build file if requested
+        if (updateGradle.get()) {
+            val gradleFile = File(project.rootDir, gradleBuildPath.get())
+            try {
+                updateGradleConfig(gradleFile, config, keystoreFile)
+                gradleUpdated = true
+                logInfo("Gradle build file updated successfully")
+            } catch (e: Exception) {
+                logError("Failed to update gradle configuration: ${e.message}")
+                throw e
+            }
+        }
+
+        // Print summary
+        printSummary(fastlaneUpdated, gradleUpdated)
+    }
+
+    /**
+     * Updates fastlane-config/android_config.rb with keystore information
+     * Matches the update_fastlane_config() function from keystore-manager.sh
+     */
+    private fun updateFastlaneConfig(configFile: File, config: KeystoreConfig, keystoreFile: File?) {
+        logInfo("Updating fastlane configuration with keystore information...")
+
+        // Determine keystore file name
+        val keystoreName = keystoreFile?.name ?: config.uploadKeystoreName
+
+        // Create the fastlane-config directory if it doesn't exist
+        val configDir = configFile.parentFile
+        if (!configDir.exists()) {
+            logInfo("Creating '${configDir.name}' directory...")
+            if (!ensureDirectoryExists(configDir)) {
+                throw IllegalStateException("Failed to create fastlane-config directory")
+            }
+        }
+
+        // Check if the config file exists
+        if (configFile.exists()) {
+            logInfo("Updating existing ${configFile.name}")
+            updateExistingFastlaneConfig(configFile, config, keystoreName)
+        } else {
+            logInfo("Creating new ${configFile.name}")
+            createNewFastlaneConfig(configFile, config, keystoreName)
+        }
+    }
+
+    /**
+     * Updates existing fastlane config file by replacing keystore values
+     */
+    private fun updateExistingFastlaneConfig(configFile: File, config: KeystoreConfig, keystoreName: String) {
+        val content = configFile.readText()
+
+        // Use regex to replace the values while preserving file structure
+        val updatedContent = content
+            .replace(Regex("default_store_file:\\s*\"[^\"]*\""), "default_store_file: \"$keystoreName\"")
+            .replace(
+                Regex("default_store_password:\\s*\"[^\"]*\""),
+                "default_store_password: \"${config.keystorePassword}\"",
+            )
+            .replace(Regex("default_key_alias:\\s*\"[^\"]*\""), "default_key_alias: \"${config.keyAlias}\"")
+            .replace(Regex("default_key_password:\\s*\"[^\"]*\""), "default_key_password: \"${config.keyPassword}\"")
+
+        configFile.writeText(updatedContent)
+    }
+
+    /**
+     * Creates new fastlane config file with complete structure
+     */
+    private fun createNewFastlaneConfig(configFile: File, config: KeystoreConfig, keystoreName: String) {
+        val content = """
+module FastlaneConfig
+  module AndroidConfig
+    STORE_CONFIG = {
+      default_store_file: "$keystoreName",
+      default_store_password: "${config.keystorePassword}",
+      default_key_alias: "${config.keyAlias}",
+      default_key_password: "${config.keyPassword}"
+    }
+
+    FIREBASE_CONFIG = {
+      firebase_prod_app_id: "1:728433984912738:android:3902eb32kjaska3363b0938f1a1dbb",
+      firebase_demo_app_id: "1:72843493212738:android:8392hjks3298ak9032skja",
+      firebase_service_creds_file: "secrets/firebaseAppDistributionServiceCredentialsFile.json",
+      firebase_groups: "mifos-mobile-apps"
+    }
+
+    BUILD_PATHS = {
+      prod_apk_path: "cmp-android/build/outputs/apk/prod/release/cmp-android-prod-release.apk",
+      demo_apk_path: "cmp-android/build/outputs/apk/demo/release/cmp-android-demo-release.apk",
+      prod_aab_path: "cmp-android/build/outputs/bundle/prodRelease/cmp-android-prod-release.aab"
+    }
+  end
+end
+        """.trimIndent()
+
+        configFile.writeText(content)
+    }
+
+    /**
+     * Updates cmp-android/build.gradle.kts with keystore information
+     * Matches the update_gradle_config() function from keystore-manager.sh
+     */
+    private fun updateGradleConfig(gradleFile: File, config: KeystoreConfig, keystoreFile: File?) {
+        logInfo("Updating Gradle build file with keystore information...")
+
+        // Check if the file exists
+        if (!gradleFile.exists()) {
+            logWarning("Gradle file not found: ${gradleFile.absolutePath}")
+            logWarning("Skipping Gradle build file update")
+            return
+        }
+
+        logInfo("Updating existing ${gradleFile.name}")
+
+        // Determine keystore path - use relative path from cmp-android directory
+        val keystorePath = if (keystoreFile != null) {
+            val gradleDir = gradleFile.parentFile
+            val relativePath = gradleDir.toPath().relativize(keystoreFile.toPath()).toString()
+            relativePath.replace('\\', '/') // Ensure forward slashes for Gradle
+        } else {
+            "../keystores/${config.uploadKeystoreName}"
+        }
+
+        // Read the current content
+        val content = gradleFile.readText()
+
+        // Create backup
+        val backupFile = File(gradleFile.absolutePath + ".bak")
+        gradleFile.copyTo(backupFile, overwrite = true)
+
+        try {
+            // Use regex to update the signing configuration lines
+            val updatedContent = content
+                .replace(
+                    Regex("storeFile = file\\(System\\.getenv\\(\"KEYSTORE_PATH\"\\) \\?\\: \"[^\"]*\"\\)"),
+                    "storeFile = file(System.getenv(\"KEYSTORE_PATH\") ?: \"$keystorePath\")",
+                )
+                .replace(
+                    Regex("storePassword = System\\.getenv\\(\"KEYSTORE_PASSWORD\"\\) \\?\\: \"[^\"]*\""),
+                    "storePassword = System.getenv(\"KEYSTORE_PASSWORD\") ?: \"${config.keystorePassword}\"",
+                )
+                .replace(
+                    Regex("keyAlias = System\\.getenv\\(\"KEYSTORE_ALIAS\"\\) \\?\\: \"[^\"]*\""),
+                    "keyAlias = System.getenv(\"KEYSTORE_ALIAS\") ?: \"${config.keyAlias}\"",
+                )
+                .replace(
+                    Regex("keyPassword = System\\.getenv\\(\"KEYSTORE_ALIAS_PASSWORD\"\\) \\?\\: \"[^\"]*\""),
+                    "keyPassword = System.getenv(\"KEYSTORE_ALIAS_PASSWORD\") ?: \"${config.keyPassword}\"",
+                )
+
+            gradleFile.writeText(updatedContent)
+
+            // Remove backup file if update was successful
+            backupFile.delete()
+
+        } catch (e: Exception) {
+            // Restore from backup if update failed
+            if (backupFile.exists()) {
+                backupFile.copyTo(gradleFile, overwrite = true)
+                backupFile.delete()
+            }
+            throw e
+        }
+    }
+
+    /**
+     * Prints a summary of the configuration file updates
+     */
+    private fun printSummary(fastlaneUpdated: Boolean, gradleUpdated: Boolean) {
+        logInfo("")
+        logInfo("=".repeat(66))
+        logInfo("                    UPDATE SUMMARY")
+        logInfo("=".repeat(66))
+
+        if (updateFastlane.get()) {
+            val fastlaneFile = File(project.rootDir, fastlaneConfigPath.get())
+            if (fastlaneUpdated) {
+                logInfo("Fastlane config: SUCCESS - ${fastlaneFile.absolutePath}")
+            } else {
+                logError("Fastlane config: FAILED")
+            }
+        }
+
+        if (updateGradle.get()) {
+            val gradleFile = File(project.rootDir, gradleBuildPath.get())
+            if (gradleUpdated) {
+                logInfo("Gradle config: SUCCESS - ${gradleFile.absolutePath}")
+            } else {
+                logError("Gradle config: FAILED")
+            }
+        }
+
+        if (fastlaneUpdated || gradleUpdated) {
+            logInfo("")
+            logInfo("Configuration files have been updated with keystore information")
+        }
+    }
+
+    companion object {
+        /**
+         * Creates a task configured for the upload keystore from keystore generation task
+         */
+        fun createForUploadKeystore(
+            task: ConfigurationFileUpdatesTask,
+            keystoreGenerationTask: KeystoreGenerationTask,
+        ) {
+            // Use the upload keystore configuration from the generation task
+            task.uploadKeystoreConfig.set(keystoreGenerationTask.uploadConfig)
+
+            // Set the keystore file from the output directory
+            val keystoreFile = keystoreGenerationTask.outputDirectory.file(
+                keystoreGenerationTask.uploadConfig.map { it.uploadKeystoreName },
+            )
+            task.uploadKeystoreFile.set(keystoreFile)
+
+            // Make this task depend on keystore generation
+            task.dependsOn(keystoreGenerationTask)
+        }
+
+        /**
+         * Creates a task with configurations loaded from secrets.env file
+         */
+        fun createWithSecretsConfig(
+            task: ConfigurationFileUpdatesTask,
+            secretsConfig: SecretsConfig = SecretsConfig(),
+        ) {
+            // Parse secrets.env file if it exists
+            val parser = SecretsEnvParser(secretsConfig)
+            val parseResult = parser.parseFile()
+
+            if (parseResult.isValid) {
+                val secrets = parseResult.allSecrets
+
+                // Apply UPLOAD keystore configuration from secrets (used for config file updates)
+                val uploadKeystoreConfig = KeystoreConfig(
+                    keystorePassword = secrets[secretsConfig.uploadKeystorePasswordKey]
+                        ?: KeystoreConfig.upload().keystorePassword,
+                    keyAlias = secrets[secretsConfig.uploadKeystoreAliasKey]
+                        ?: KeystoreConfig.upload().keyAlias,
+                    keyPassword = secrets[secretsConfig.uploadKeystoreAliasPasswordKey]
+                        ?: KeystoreConfig.upload().keyPassword,
+                    companyName = secrets["COMPANY_NAME"] ?: KeystoreConfig.upload().companyName,
+                    department = secrets["DEPARTMENT"] ?: KeystoreConfig.upload().department,
+                    organization = secrets["ORGANIZATION"] ?: KeystoreConfig.upload().organization,
+                    city = secrets["CITY"] ?: KeystoreConfig.upload().city,
+                    state = secrets["STATE"] ?: KeystoreConfig.upload().state,
+                    country = secrets["COUNTRY"] ?: KeystoreConfig.upload().country,
+                    uploadKeystoreName = secrets["UPLOAD_KEYSTORE_NAME"]
+                        ?: KeystoreConfig.upload().uploadKeystoreName,
+                )
+
+                task.uploadKeystoreConfig.set(uploadKeystoreConfig)
+                task.logger.lifecycle("[KEYSTORE] Loaded configuration from ${secretsConfig.secretsEnvFile.name}")
+            } else {
+                task.logger.warn("[KEYSTORE] Could not parse ${secretsConfig.secretsEnvFile.name}: ${parseResult.errors}")
+                task.logger.lifecycle("[KEYSTORE] Using default configurations")
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/ConfigurationValidator.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/ConfigurationValidator.kt
new file mode 100644
index 000000000..24d11ca4b
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/ConfigurationValidator.kt
@@ -0,0 +1,332 @@
+package org.convention.keystore
+
+/**
+ * Validates configuration parameters for keystore management
+ * Implements comprehensive validation logic matching keystore-manager.sh script validation
+ */
+class ConfigurationValidator {
+
+    /**
+     * Validation result containing errors and warnings
+     */
+    data class ValidationResult(
+        val errors: List<String>,
+        val warnings: List<String>
+    ) {
+        val isValid: Boolean get() = errors.isEmpty()
+        val hasWarnings: Boolean get() = warnings.isNotEmpty()
+    }
+
+    /**
+     * Validates keystore configuration
+     */
+    fun validateKeystoreConfig(config: KeystoreConfig): ValidationResult {
+        val errors = mutableListOf<String>()
+        val warnings = mutableListOf<String>()
+
+        // Validate passwords
+        validatePassword(config.keystorePassword, "keystore password", errors, warnings)
+        validatePassword(config.keyPassword, "key password", errors, warnings)
+
+        // Validate key alias
+        if (config.keyAlias.isBlank()) {
+            errors.add("Key alias cannot be blank")
+        } else if (config.keyAlias.length < 3) {
+            warnings.add("Key alias is very short (${config.keyAlias.length} characters)")
+        }
+
+        // Validate algorithm and key size
+        validateKeyAlgorithm(config.keyAlgorithm, config.keySize, errors, warnings)
+
+        // Validate validity period
+        if (config.validity <= 0) {
+            errors.add("Validity period must be positive")
+        } else if (config.validity < 1) {
+            warnings.add("Validity period is very short (${config.validity} years)")
+        } else if (config.validity > 50) {
+            warnings.add("Validity period is very long (${config.validity} years)")
+        }
+
+        // Validate distinguished name components
+        validateDistinguishedName(config, errors, warnings)
+
+        // Validate file paths
+        validateFilePaths(config, errors, warnings)
+
+        return ValidationResult(errors, warnings)
+    }
+
+    /**
+     * Validates secrets configuration
+     */
+    fun validateSecretsConfig(config: SecretsConfig): ValidationResult {
+        val errors = mutableListOf<String>()
+        val warnings = mutableListOf<String>()
+
+        // Validate file paths
+        if (config.secretsEnvFile.name.isBlank()) {
+            errors.add("Secrets file name cannot be blank")
+        }
+
+        if (!config.secretsEnvFile.name.endsWith(".env")) {
+            warnings.add("Secrets file should have .env extension")
+        }
+
+        // Validate backup settings
+        if (config.createBackup && config.backupDir.name.isBlank()) {
+            errors.add("Backup directory name cannot be blank when backup is enabled")
+        }
+
+        // Validate heredoc settings
+        if (config.useHeredocFormat && config.heredocDelimiter.isBlank()) {
+            errors.add("Heredoc delimiter cannot be blank when heredoc format is enabled")
+        }
+
+        if (config.base64LineLength <= 0) {
+            errors.add("Base64 line length must be positive")
+        }
+
+        // Validate secret key names
+        validateSecretKeyNames(config, errors, warnings)
+
+        return ValidationResult(errors, warnings)
+    }
+
+    /**
+     * Validates environment configuration by checking system properties and environment variables
+     */
+    fun validateEnvironmentConfiguration(): ValidationResult {
+        val errors = mutableListOf<String>()
+        val warnings = mutableListOf<String>()
+
+        // Check Java version for keytool compatibility
+        val javaVersion = System.getProperty("java.version")
+        if (javaVersion != null) {
+            val majorVersion = extractJavaMajorVersion(javaVersion)
+            if (majorVersion < 8) {
+                errors.add("Java 8 or higher is required for keytool. Current version: $javaVersion")
+            }
+        } else {
+            warnings.add("Unable to determine Java version")
+        }
+
+        // Check OS compatibility
+        val osName = System.getProperty("os.name")?.lowercase()
+        if (osName?.contains("windows") == true) {
+            warnings.add("Windows detected. Ensure proper path handling for keystore files")
+        }
+
+        // Check available memory
+        val maxMemory = Runtime.getRuntime().maxMemory()
+        val availableMemory = maxMemory / (1024 * 1024) // Convert to MB
+        if (availableMemory < 256) {
+            warnings.add("Low available memory ($availableMemory MB). Keystore operations may be slow")
+        }
+
+        return ValidationResult(errors, warnings)
+    }
+
+    /**
+     * Validates parsed secrets from secrets.env file
+     */
+    fun validateParsedSecrets(parseResult: SecretsEnvParser.ParseResult, config: SecretsConfig): ValidationResult {
+        val errors = mutableListOf<String>()
+        val warnings = mutableListOf<String>()
+
+        // First check if parsing was successful
+        if (!parseResult.isValid) {
+            errors.addAll(parseResult.errors)
+            return ValidationResult(errors, warnings)
+        }
+
+        val allSecrets = parseResult.allSecrets
+
+        // Validate required keystore secrets
+        validateRequiredKeystoreSecrets(allSecrets, config, errors)
+
+        // Validate secret values
+        validateSecretValues(allSecrets, warnings)
+
+        // Check for potential issues
+        validateSecretPatterns(allSecrets, warnings)
+
+        return ValidationResult(errors, warnings)
+    }
+
+    private fun validatePassword(password: String, passwordType: String, errors: MutableList<String>, warnings: MutableList<String>) {
+        when {
+            password.isBlank() -> errors.add("$passwordType cannot be blank")
+            password.length < 6 -> warnings.add("$passwordType is weak (less than 6 characters)")
+            password == "android" || password == "password" -> warnings.add("$passwordType is using a default/common value")
+            !password.any { it.isDigit() } -> warnings.add("$passwordType should contain at least one digit")
+            !password.any { it.isLetter() } -> warnings.add("$passwordType should contain at least one letter")
+        }
+    }
+
+    private fun validateKeyAlgorithm(algorithm: String, keySize: Int, errors: MutableList<String>, warnings: MutableList<String>) {
+        when (algorithm.uppercase()) {
+            "RSA" -> {
+                when {
+                    keySize < 2048 -> errors.add("RSA key size must be at least 2048 bits")
+                    keySize > 4096 -> warnings.add("RSA key size is very large ($keySize bits), may slow down operations")
+                }
+            }
+            "DSA" -> {
+                if (keySize < 1024) {
+                    errors.add("DSA key size must be at least 1024 bits")
+                }
+                warnings.add("DSA algorithm is less commonly used than RSA")
+            }
+            "EC" -> {
+                if (keySize < 256) {
+                    errors.add("EC key size must be at least 256 bits")
+                }
+            }
+            else -> {
+                warnings.add("Unknown or uncommon key algorithm: $algorithm")
+            }
+        }
+    }
+
+    private fun validateDistinguishedName(config: KeystoreConfig, errors: MutableList<String>, warnings: MutableList<String>) {
+        // Validate country code
+        if (config.country.length != 2) {
+            errors.add("Country code must be exactly 2 characters")
+        } else if (!config.country.matches(Regex("[A-Z]{2}"))) {
+            warnings.add("Country code should be uppercase letters")
+        }
+
+        // Check for common DN issues
+        if (config.companyName.contains("Android Debug") && config.keyAlias != "androiddebugkey") {
+            warnings.add("Using debug certificate info for non-debug keystore")
+        }
+
+        // Validate required DN components
+        if (config.companyName.isBlank()) {
+            warnings.add("Company name (CN) is blank")
+        }
+
+        if (config.organization.isBlank()) {
+            warnings.add("Organization (O) is blank")
+        }
+    }
+
+    private fun validateFilePaths(config: KeystoreConfig, errors: MutableList<String>, warnings: MutableList<String>) {
+        // Check keystore directory
+        if (!config.keystoreDir.exists() && !config.keystoreDir.mkdirs()) {
+            errors.add("Cannot create keystore directory: ${config.keystoreDir.absolutePath}")
+        }
+
+        // Check file names
+        if (!config.originalKeystoreName.endsWith(".keystore") && !config.originalKeystoreName.endsWith(".jks")) {
+            warnings.add("Original keystore file should have .keystore or .jks extension")
+        }
+
+        if (!config.uploadKeystoreName.endsWith(".keystore") && !config.uploadKeystoreName.endsWith(".jks")) {
+            warnings.add("Upload keystore file should have .keystore or .jks extension")
+        }
+
+        // Check for file conflicts
+        if (config.originalKeystorePath.exists() && !config.overwriteExisting) {
+            warnings.add("Original keystore file already exists and overwrite is disabled")
+        }
+
+        if (config.uploadKeystorePath.exists() && !config.overwriteExisting) {
+            warnings.add("Upload keystore file already exists and overwrite is disabled")
+        }
+    }
+
+    private fun validateSecretKeyNames(config: SecretsConfig, errors: MutableList<String>, warnings: MutableList<String>) {
+        val secretKeys = listOf(
+            config.originalKeystorePasswordKey,
+            config.originalKeystoreAliasKey,
+            config.originalKeystoreAliasPasswordKey,
+            config.originalKeystoreFileKey,
+            config.uploadKeystorePasswordKey,
+            config.uploadKeystoreAliasKey,
+            config.uploadKeystoreAliasPasswordKey,
+            config.uploadKeystoreFileKey
+        )
+
+        secretKeys.forEach { key ->
+            if (key.isBlank()) {
+                errors.add("Secret key name cannot be blank")
+            } else if (!key.matches(Regex("[A-Z_][A-Z0-9_]*"))) {
+                warnings.add("Secret key '$key' should follow UPPER_SNAKE_CASE convention")
+            }
+        }
+    }
+
+    private fun validateRequiredKeystoreSecrets(secrets: Map<String, String>, config: SecretsConfig, errors: MutableList<String>) {
+        val requiredKeys = listOf(
+            config.originalKeystorePasswordKey,
+            config.originalKeystoreAliasKey,
+            config.originalKeystoreAliasPasswordKey,
+            config.uploadKeystorePasswordKey,
+            config.uploadKeystoreAliasKey,
+            config.uploadKeystoreAliasPasswordKey
+        )
+
+        requiredKeys.forEach { key ->
+            when {
+                !secrets.containsKey(key) -> errors.add("Missing required secret: $key")
+                secrets[key].isNullOrBlank() -> errors.add("Empty value for required secret: $key")
+            }
+        }
+    }
+
+    private fun validateSecretValues(secrets: Map<String, String>, warnings: MutableList<String>) {
+        secrets.forEach { (key, value) ->
+            when {
+                key.contains("PASSWORD") && value.length < 6 ->
+                    warnings.add("Password secret '$key' is weak (less than 6 characters)")
+
+                key.contains("ALIAS") && value.length < 3 ->
+                    warnings.add("Alias secret '$key' is very short")
+
+                value.contains("android") && !key.contains("ORIGINAL") ->
+                    warnings.add("Secret '$key' contains 'android' which might be a default value")
+            }
+        }
+    }
+
+    private fun validateSecretPatterns(secrets: Map<String, String>, warnings: MutableList<String>) {
+        // Check for duplicate values
+        val valueGroups = secrets.values.groupBy { it }
+        valueGroups.forEach { (value, occurrences) ->
+            if (occurrences.size > 1 && value.isNotBlank()) {
+                val keys = secrets.filterValues { it == value }.keys
+                warnings.add("Duplicate value found in secrets: ${keys.joinToString(", ")}")
+            }
+        }
+
+        // Check for suspicious patterns
+        secrets.forEach { (key, value) ->
+            when {
+                value.matches(Regex(".*test.*", RegexOption.IGNORE_CASE)) ->
+                    warnings.add("Secret '$key' contains 'test' - ensure this is not a test value")
+
+                value.matches(Regex(".*demo.*", RegexOption.IGNORE_CASE)) ->
+                    warnings.add("Secret '$key' contains 'demo' - ensure this is not a demo value")
+
+                value.matches(Regex(".*example.*", RegexOption.IGNORE_CASE)) ->
+                    warnings.add("Secret '$key' contains 'example' - ensure this is not an example value")
+            }
+        }
+    }
+
+    private fun extractJavaMajorVersion(version: String): Int {
+        return try {
+            val parts = version.split(".")
+            if (parts[0] == "1" && parts.size > 1) {
+                // Java 1.8 format
+                parts[1].toInt()
+            } else {
+                // Java 9+ format
+                parts[0].toInt()
+            }
+        } catch (e: Exception) {
+            0 // Unknown version
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/EnvironmentOverrideHandler.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/EnvironmentOverrideHandler.kt
new file mode 100644
index 000000000..5a168c4de
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/EnvironmentOverrideHandler.kt
@@ -0,0 +1,306 @@
+package org.convention.keystore
+
+import java.io.File
+
+/**
+ * Handles environment variable overrides for keystore configuration
+ * Matches the behavior of keystore-manager.sh script's environment variable handling
+ */
+class EnvironmentOverrideHandler {
+
+    /**
+     * Result of applying environment overrides
+     */
+    data class OverrideResult(
+        val updatedSecrets: Map<String, String>,
+        val overriddenKeys: Set<String>,
+        val warnings: List<String>
+    )
+
+    /**
+     * Applies environment variable overrides to parsed secrets
+     * Environment variables take precedence over secrets.env file values
+     */
+    fun applyEnvironmentOverrides(
+        parsedSecrets: Map<String, String>,
+        config: SecretsConfig
+    ): OverrideResult {
+        val updatedSecrets = parsedSecrets.toMutableMap()
+        val overriddenKeys = mutableSetOf<String>()
+        val warnings = mutableListOf<String>()
+
+        // Get all environment variables
+        val envVars = System.getenv()
+
+        // Apply overrides for all secrets
+        parsedSecrets.keys.forEach { key ->
+            val envValue = envVars[key]
+            if (envValue != null) {
+                if (envValue != parsedSecrets[key]) {
+                    updatedSecrets[key] = envValue
+                    overriddenKeys.add(key)
+
+                    // Warn about excluded keys being overridden
+                    if (config.isKeyExcluded(key)) {
+                        warnings.add("Environment variable override for excluded key: $key")
+                    }
+                }
+            }
+        }
+
+        // Check for additional environment variables that might be keystore-related
+        val keystoreRelatedEnvVars = findKeystoreRelatedEnvVars(envVars)
+        keystoreRelatedEnvVars.forEach { (key, value) ->
+            if (!updatedSecrets.containsKey(key)) {
+                updatedSecrets[key] = value
+                overriddenKeys.add(key)
+                warnings.add("Added new secret from environment variable: $key")
+            }
+        }
+
+        return OverrideResult(
+            updatedSecrets = updatedSecrets,
+            overriddenKeys = overriddenKeys,
+            warnings = warnings
+        )
+    }
+
+    /**
+     * Creates a KeystoreConfig with environment variable overrides applied
+     */
+    fun createOverriddenKeystoreConfig(baseConfig: KeystoreConfig): KeystoreConfig {
+        val env = System.getenv()
+
+        return baseConfig.copy(
+            // Basic keystore parameters
+            keystorePassword = env["KEYSTORE_PASSWORD"] ?: baseConfig.keystorePassword,
+            keyAlias = env["KEY_ALIAS"] ?: env["KEYSTORE_ALIAS"] ?: baseConfig.keyAlias,
+            keyPassword = env["KEY_PASSWORD"] ?: env["KEYSTORE_KEY_PASSWORD"] ?: baseConfig.keyPassword,
+            keyAlgorithm = env["KEYALG"] ?: baseConfig.keyAlgorithm,
+            keySize = env["KEYSIZE"]?.toIntOrNull() ?: baseConfig.keySize,
+            validity = env["VALIDITY"]?.toIntOrNull() ?: baseConfig.validity,
+
+            // Certificate DN components (using both descriptive and traditional names)
+            companyName = env["COMPANY_NAME"] ?: env["CN"] ?: baseConfig.companyName,
+            department = env["DEPARTMENT"] ?: env["OU"] ?: baseConfig.department,
+            organization = env["ORGANIZATION"] ?: env["O"] ?: baseConfig.organization,
+            city = env["CITY"] ?: env["L"] ?: baseConfig.city,
+            state = env["STATE"] ?: env["ST"] ?: baseConfig.state,
+            country = env["COUNTRY"] ?: env["C"] ?: baseConfig.country,
+
+            // File paths
+            keystoreDir = env["KEYSTORE_DIR"]?.let { File(it) } ?: baseConfig.keystoreDir,
+            originalKeystoreName = env["ORIGINAL_KEYSTORE_NAME"] ?: baseConfig.originalKeystoreName,
+            uploadKeystoreName = env["UPLOAD_KEYSTORE_NAME"] ?: baseConfig.uploadKeystoreName,
+
+            // Behavior flags
+            overwriteExisting = env["OVERWRITE"]?.toBoolean() ?: baseConfig.overwriteExisting
+        )
+    }
+
+    /**
+     * Creates a SecretsConfig with environment variable overrides applied
+     */
+    fun createOverriddenSecretsConfig(baseConfig: SecretsConfig): SecretsConfig {
+        val env = System.getenv()
+
+        return baseConfig.copy(
+            // File paths
+            secretsEnvFile = env["SECRETS_ENV_FILE"]?.let { File(it) } ?: baseConfig.secretsEnvFile,
+            backupDir = env["SECRETS_BACKUP_DIR"]?.let { File(it) } ?: baseConfig.backupDir,
+
+            // Base64 encoding settings
+            base64LineLength = env["BASE64_LINE_LENGTH"]?.toIntOrNull() ?: baseConfig.base64LineLength,
+            useHeredocFormat = env["USE_HEREDOC_FORMAT"]?.toBoolean() ?: baseConfig.useHeredocFormat,
+            heredocDelimiter = env["HEREDOC_DELIMITER"] ?: baseConfig.heredocDelimiter,
+
+            // File processing options
+            createBackup = env["CREATE_BACKUP"]?.toBoolean() ?: baseConfig.createBackup,
+            preserveComments = env["PRESERVE_COMMENTS"]?.toBoolean() ?: baseConfig.preserveComments
+        )
+    }
+
+    /**
+     * Gets environment variables that override keystore file paths
+     */
+    fun getKeystorePathOverrides(): Map<String, String> {
+        val env = System.getenv()
+        val pathOverrides = mutableMapOf<String, String>()
+
+        // Check for common keystore path environment variables
+        env["KEYSTORE_PATH"]?.let { pathOverrides["KEYSTORE_PATH"] = it }
+        env["ORIGINAL_KEYSTORE_PATH"]?.let { pathOverrides["ORIGINAL_KEYSTORE_PATH"] = it }
+        env["UPLOAD_KEYSTORE_PATH"]?.let { pathOverrides["UPLOAD_KEYSTORE_PATH"] = it }
+        env["RELEASE_KEYSTORE_PATH"]?.let { pathOverrides["RELEASE_KEYSTORE_PATH"] = it }
+        env["DEBUG_KEYSTORE_PATH"]?.let { pathOverrides["DEBUG_KEYSTORE_PATH"] = it }
+
+        return pathOverrides
+    }
+
+    /**
+     * Checks if environment contains CI/CD specific variables
+     */
+    fun isRunningInCiCd(): Boolean {
+        val env = System.getenv()
+
+        // Common CI/CD environment indicators
+        val ciIndicators = listOf(
+            "CI", "CONTINUOUS_INTEGRATION",
+            "GITHUB_ACTIONS", "GITLAB_CI", "JENKINS_URL", "TEAMCITY_VERSION",
+            "TRAVIS", "CIRCLECI", "BUILDKITE", "BUILD_NUMBER"
+        )
+
+        return ciIndicators.any { env.containsKey(it) }
+    }
+
+    /**
+     * Gets CI/CD specific environment information
+     */
+    fun getCiCdEnvironmentInfo(): Map<String, String> {
+        val env = System.getenv()
+        val ciInfo = mutableMapOf<String, String>()
+
+        // GitHub Actions
+        env["GITHUB_ACTIONS"]?.let { ciInfo["platform"] = "GitHub Actions" }
+        env["GITHUB_REPOSITORY"]?.let { ciInfo["repository"] = it }
+        env["GITHUB_REF"]?.let { ciInfo["ref"] = it }
+
+        // GitLab CI
+        env["GITLAB_CI"]?.let { ciInfo["platform"] = "GitLab CI" }
+        env["CI_PROJECT_PATH"]?.let { ciInfo["repository"] = it }
+        env["CI_COMMIT_REF_NAME"]?.let { ciInfo["ref"] = it }
+
+        // Jenkins
+        env["JENKINS_URL"]?.let { ciInfo["platform"] = "Jenkins" }
+        env["JOB_NAME"]?.let { ciInfo["job"] = it }
+        env["BUILD_NUMBER"]?.let { ciInfo["build"] = it }
+
+        // Generic CI info
+        env["CI"]?.let { if (ciInfo["platform"] == null) ciInfo["platform"] = "Generic CI" }
+
+        return ciInfo
+    }
+
+    /**
+     * Validates that required environment variables are set for CI/CD
+     */
+    fun validateCiCdEnvironment(requiredSecrets: List<String>): List<String> {
+        val env = System.getenv()
+        val errors = mutableListOf<String>()
+
+        if (isRunningInCiCd()) {
+            requiredSecrets.forEach { secret ->
+                if (!env.containsKey(secret)) {
+                    errors.add("Required environment variable not set in CI/CD: $secret")
+                } else if (env[secret].isNullOrBlank()) {
+                    errors.add("Required environment variable is empty in CI/CD: $secret")
+                }
+            }
+
+            // Check for common CI/CD keystore secrets
+            val commonCiSecrets = listOf(
+                "KEYSTORE_PASSWORD", "KEY_PASSWORD", "KEYSTORE_ALIAS"
+            )
+
+            commonCiSecrets.forEach { secret ->
+                if (!env.containsKey(secret)) {
+                    errors.add("Common CI/CD keystore secret not found: $secret")
+                }
+            }
+        }
+
+        return errors
+    }
+
+    /**
+     * Finds environment variables that appear to be keystore-related
+     */
+    private fun findKeystoreRelatedEnvVars(envVars: Map<String, String>): Map<String, String> {
+        val keystorePatterns = listOf(
+            ".*KEYSTORE.*", ".*KEY_.*", ".*ALIAS.*", ".*STORE_.*",
+            ".*UPLOAD.*", ".*ORIGINAL.*", ".*RELEASE.*", ".*DEBUG.*"
+        )
+
+        return envVars.filterKeys { key ->
+            keystorePatterns.any { pattern ->
+                key.matches(Regex(pattern, RegexOption.IGNORE_CASE))
+            }
+        }
+    }
+
+    /**
+     * Sanitizes environment variable values for logging (hides sensitive data)
+     */
+    fun sanitizeEnvVarForLogging(key: String, value: String): String {
+        val sensitivePatterns = listOf(
+            ".*PASSWORD.*", ".*SECRET.*", ".*KEY.*", ".*TOKEN.*", ".*PRIVATE.*"
+        )
+
+        return if (sensitivePatterns.any { key.matches(Regex(it, RegexOption.IGNORE_CASE)) }) {
+            if (value.length <= 4) "***" else "${value.take(2)}${"*".repeat(value.length - 4)}${value.takeLast(2)}"
+        } else {
+            value
+        }
+    }
+
+    /**
+     * Creates a summary of all environment overrides applied
+     */
+    fun createOverrideSummary(overrideResult: OverrideResult): String {
+        val summary = StringBuilder()
+
+        summary.appendLine("Environment Override Summary:")
+        summary.appendLine("=".repeat(50))
+
+        if (overrideResult.overriddenKeys.isEmpty()) {
+            summary.appendLine("No environment overrides applied")
+        } else {
+            summary.appendLine("Overridden keys (${overrideResult.overriddenKeys.size}):")
+            overrideResult.overriddenKeys.sorted().forEach { key ->
+                val value = overrideResult.updatedSecrets[key] ?: ""
+                val sanitizedValue = sanitizeEnvVarForLogging(key, value)
+                summary.appendLine("  $key = $sanitizedValue")
+            }
+        }
+
+        if (overrideResult.warnings.isNotEmpty()) {
+            summary.appendLine("\nWarnings:")
+            overrideResult.warnings.forEach { warning ->
+                summary.appendLine("  • $warning")
+            }
+        }
+
+        // Add CI/CD information if applicable
+        if (isRunningInCiCd()) {
+            summary.appendLine("\nCI/CD Environment Detected:")
+            getCiCdEnvironmentInfo().forEach { (key, value) ->
+                summary.appendLine("  $key: $value")
+            }
+        }
+
+        return summary.toString()
+    }
+
+    companion object {
+        /**
+         * Standard environment variable names for keystore configuration
+         */
+        object StandardEnvVars {
+            const val KEYSTORE_PASSWORD = "KEYSTORE_PASSWORD"
+            const val KEY_PASSWORD = "KEY_PASSWORD"
+            const val KEYSTORE_ALIAS = "KEYSTORE_ALIAS"
+            const val KEYSTORE_PATH = "KEYSTORE_PATH"
+            const val KEYSTORE_DIR = "KEYSTORE_DIR"
+
+            // Original keystore specific
+            const val ORIGINAL_KEYSTORE_PASSWORD = "ORIGINAL_KEYSTORE_FILE_PASSWORD"
+            const val ORIGINAL_KEYSTORE_ALIAS = "ORIGINAL_KEYSTORE_ALIAS"
+            const val ORIGINAL_KEYSTORE_ALIAS_PASSWORD = "ORIGINAL_KEYSTORE_ALIAS_PASSWORD"
+
+            // Upload keystore specific
+            const val UPLOAD_KEYSTORE_PASSWORD = "UPLOAD_KEYSTORE_FILE_PASSWORD"
+            const val UPLOAD_KEYSTORE_ALIAS = "UPLOAD_KEYSTORE_ALIAS"
+            const val UPLOAD_KEYSTORE_ALIAS_PASSWORD = "UPLOAD_KEYSTORE_ALIAS_PASSWORD"
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreConfig.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreConfig.kt
new file mode 100644
index 000000000..badda35fe
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreConfig.kt
@@ -0,0 +1,76 @@
+package org.convention.keystore
+
+import java.io.File
+
+/**
+ * Configuration for keystore generation matching keystore-manager.sh script parameters
+ */
+data class KeystoreConfig(
+    // Basic keystore parameters
+    val keystorePassword: String = "android",
+    val keyAlias: String = "upload",
+    val keyPassword: String = "android",
+    val keyAlgorithm: String = "RSA",
+    val keySize: Int = 2048,
+    val validity: Int = 25, // years
+
+    // Certificate DN components (mapped from script variables)
+    val companyName: String = "Android Debug",    // COMPANY_NAME -> CN
+    val department: String = "Android",           // DEPARTMENT -> OU
+    val organization: String = "Android",         // ORGANIZATION -> O
+    val city: String = "Unknown",                 // CITY -> L
+    val state: String = "Unknown",                // STATE -> ST
+    val country: String = "US",                   // COUNTRY -> C
+
+    // File paths (matching script defaults)
+    val keystoreDir: File = File("keystores"),
+    val originalKeystoreName: String = "original.keystore",  // ORIGINAL_KEYSTORE_NAME
+    val uploadKeystoreName: String = "upload.keystore",      // UPLOAD_KEYSTORE_NAME
+
+    // Behavior flags
+    val overwriteExisting: Boolean = false        // OVERWRITE in script
+) {
+
+    /**
+     * Distinguished Name for certificate generation (matches script DN construction)
+     */
+    val distinguishedName: String
+        get() = "CN=$companyName, OU=$department, O=$organization, L=$city, ST=$state, C=$country"
+
+    val originalKeystorePath: File get() = File(keystoreDir, originalKeystoreName)
+    val uploadKeystorePath: File get() = File(keystoreDir, uploadKeystoreName)
+
+    /**
+     * Validates configuration parameters
+     */
+    fun validate(): List<String> {
+        val errors = mutableListOf<String>()
+        if (keystorePassword.isBlank()) errors.add("Keystore password cannot be blank")
+        if (keyAlias.isBlank()) errors.add("Key alias cannot be blank")
+        if (keyPassword.isBlank()) errors.add("Key password cannot be blank")
+        if (keySize < 1024) errors.add("Key size must be at least 1024 bits")
+        if (validity <= 0) errors.add("Validity period must be positive")
+        if (country.length != 2) errors.add("Country code must be exactly 2 characters")
+        return errors
+    }
+
+    companion object {
+        /**
+         * Creates default configuration matching script's ORIGINAL keystore
+         */
+        fun original(): KeystoreConfig = KeystoreConfig(
+            companyName = "Android Debug",
+            keyAlias = "androiddebugkey",
+            originalKeystoreName = "original.keystore"
+        )
+
+        /**
+         * Creates default configuration matching script's UPLOAD keystore
+         */
+        fun upload(): KeystoreConfig = KeystoreConfig(
+            companyName = "Android Release",
+            keyAlias = "upload",
+            uploadKeystoreName = "upload.keystore"
+        )
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreGenerationTask.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreGenerationTask.kt
new file mode 100644
index 000000000..2cef30917
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreGenerationTask.kt
@@ -0,0 +1,353 @@
+package org.convention.keystore
+
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+import org.gradle.work.DisableCachingByDefault
+import java.io.File
+import java.util.concurrent.TimeUnit
+
+/**
+ * Gradle task for generating Android keystores using keytool
+ * 
+ * This task replicates the functionality of the keystore-manager.sh script's
+ * generate_keystore and generate_keystores functions, providing native Gradle DSL
+ * support for cross-platform keystore generation.
+ */
+@DisableCachingByDefault(because = "Keystore generation is not a cacheable task")
+abstract class KeystoreGenerationTask : BaseKeystoreTask() {
+
+    @get:Input
+    @get:Optional
+    abstract val generateOriginal: Property<Boolean>
+
+    @get:Input
+    @get:Optional
+    abstract val generateUpload: Property<Boolean>
+
+    @get:Input
+    @get:Optional
+    abstract val originalConfig: Property<KeystoreConfig>
+
+    @get:Input
+    @get:Optional
+    abstract val uploadConfig: Property<KeystoreConfig>
+
+    @get:OutputDirectory
+    abstract val outputDirectory: DirectoryProperty
+
+    init {
+        description = "Generates Android keystores (ORIGINAL and UPLOAD) using keytool"
+        
+        // Set default values
+        generateOriginal.convention(true)
+        generateUpload.convention(true)
+        outputDirectory.convention(project.layout.projectDirectory.dir("keystores"))
+        
+        // Set default keystore configurations
+        originalConfig.convention(KeystoreConfig.original())
+        uploadConfig.convention(KeystoreConfig.upload())
+    }
+
+    @TaskAction
+    fun generateKeystores() {
+        logInfo("Starting keystore generation task")
+
+        // Validate keytool availability
+        if (!checkKeytoolAvailable()) {
+            throw IllegalStateException("keytool is not available. Please ensure JDK is installed and keytool is in PATH.")
+        }
+
+        // Create keystores directory
+        val keystoreDir = outputDirectory.asFile.get()
+        if (!ensureDirectoryExists(keystoreDir)) {
+            throw IllegalStateException("Failed to create keystores directory: ${keystoreDir.absolutePath}")
+        }
+
+        var originalResult = true
+        var uploadResult = true
+
+        // Generate ORIGINAL keystore if requested
+        if (generateOriginal.get()) {
+            logInfo("=".repeat(66))
+            logInfo("Generating ORIGINAL keystore")
+            logInfo("=".repeat(66))
+            
+            val originalKeystoreConfig = originalConfig.get()
+            originalResult = generateKeystore(
+                environment = "ORIGINAL",
+                config = originalKeystoreConfig,
+                keystorePath = File(keystoreDir, originalKeystoreConfig.originalKeystoreName)
+            )
+        }
+
+        // Generate UPLOAD keystore if requested
+        if (generateUpload.get()) {
+            logInfo("=".repeat(66))
+            logInfo("Generating UPLOAD keystore")
+            logInfo("=".repeat(66))
+            
+            val uploadKeystoreConfig = uploadConfig.get()
+            uploadResult = generateKeystore(
+                environment = "UPLOAD",
+                config = uploadKeystoreConfig,
+                keystorePath = File(keystoreDir, uploadKeystoreConfig.uploadKeystoreName)
+            )
+        }
+
+        // Print summary
+        printSummary(originalResult, uploadResult, keystoreDir)
+
+        // Fail the task if any keystore generation failed
+        if (!originalResult || !uploadResult) {
+            throw IllegalStateException("One or more keystores failed to generate")
+        }
+    }
+
+    /**
+     * Generates a single keystore using keytool (matches script's generate_keystore function)
+     */
+    private fun generateKeystore(
+        environment: String,
+        config: KeystoreConfig,
+        keystorePath: File
+    ): Boolean {
+        try {
+            // Log keystore parameters
+            logKeystoreParameters(environment, config, keystorePath)
+
+            // Check if keystore already exists and handle overwrite behavior
+            if (keystorePath.exists()) {
+                if (config.overwriteExisting) {
+                    logInfo("Overwriting existing keystore file '${keystorePath.name}'")
+                } else {
+                    logInfo("Keystore file '${keystorePath.name}' already exists and OVERWRITE is not set to 'true'")
+                    logInfo("Using existing keystore")
+                    return true
+                }
+            }
+
+            // Build keytool command
+            val command = buildKeytoolCommand(config, keystorePath)
+            
+            // Execute keytool command
+            logInfo("Executing keytool command...")
+            val success = executeKeytoolCommand(command)
+
+            if (success && keystorePath.exists()) {
+                logInfo("")
+                logInfo("===== $environment Keystore created successfully! =====")
+                logInfo("Keystore location: ${keystorePath.absolutePath}")
+                logInfo("Keystore alias: ${config.keyAlias}")
+                logInfo("")
+                return true
+            } else {
+                logError("")
+                logError("Error: Failed to create $environment keystore. Please check the error messages above.")
+                return false
+            }
+
+        } catch (e: Exception) {
+            logError("Exception during $environment keystore generation: ${e.message}")
+            e.printStackTrace()
+            return false
+        }
+    }
+
+    /**
+     * Logs keystore generation parameters (matches script output format)
+     */
+    private fun logKeystoreParameters(environment: String, config: KeystoreConfig, keystorePath: File) {
+        logInfo("Generating keystore with the following parameters:")
+        logInfo("- Environment: $environment")
+        logInfo("- Keystore Name: ${keystorePath.absolutePath}")
+        logInfo("- Key Alias: ${config.keyAlias}")
+        logInfo("- Validity: ${config.validity} years")
+        logInfo("- Key Algorithm: ${config.keyAlgorithm}")
+        logInfo("- Key Size: ${config.keySize}")
+        logInfo("- Distinguished Name: ${config.distinguishedName}")
+    }
+
+    /**
+     * Builds the keytool command arguments (matches script's keytool invocation)
+     */
+    private fun buildKeytoolCommand(config: KeystoreConfig, keystorePath: File): List<String> {
+        return listOf(
+            "keytool",
+            "-genkey",
+            "-v",
+            "-keystore", keystorePath.absolutePath,
+            "-alias", config.keyAlias,
+            "-keyalg", config.keyAlgorithm,
+            "-keysize", config.keySize.toString(),
+            "-validity", (config.validity * 365).toString(), // Convert years to days
+            "-storepass", config.keystorePassword,
+            "-keypass", config.keyPassword,
+            "-dname", config.distinguishedName
+        )
+    }
+
+    /**
+     * Executes the keytool command with proper error handling
+     */
+    private fun executeKeytoolCommand(command: List<String>): Boolean {
+        return try {
+            logInfo("Command: ${command.joinToString(" ") { if (it.contains(" ")) "\"$it\"" else it }}")
+            
+            val processBuilder = ProcessBuilder(command)
+            processBuilder.redirectErrorStream(true)
+            
+            val process = processBuilder.start()
+            
+            // Capture output
+            val output = process.inputStream.bufferedReader().readText()
+            
+            // Wait for process to complete with timeout
+            val finished = process.waitFor(60, TimeUnit.SECONDS)
+            
+            if (!finished) {
+                logError("Keytool command timed out after 60 seconds")
+                process.destroyForcibly()
+                return false
+            }
+            
+            val exitCode = process.exitValue()
+            
+            if (exitCode == 0) {
+                logInfo("Keytool command completed successfully")
+                if (output.isNotBlank()) {
+                    logInfo("Keytool output:")
+                    output.lines().forEach { line ->
+                        if (line.isNotBlank()) {
+                            logInfo("  $line")
+                        }
+                    }
+                }
+                true
+            } else {
+                logError("Keytool command failed with exit code: $exitCode")
+                if (output.isNotBlank()) {
+                    logError("Keytool error output:")
+                    output.lines().forEach { line ->
+                        if (line.isNotBlank()) {
+                            logError("  $line")
+                        }
+                    }
+                }
+                false
+            }
+            
+        } catch (e: Exception) {
+            logError("Failed to execute keytool command: ${e.message}")
+            e.printStackTrace()
+            false
+        }
+    }
+
+    /**
+     * Prints summary of keystore generation results (matches script summary format)
+     */
+    private fun printSummary(originalResult: Boolean, uploadResult: Boolean, keystoreDir: File) {
+        logInfo("")
+        logInfo("=".repeat(66))
+        logInfo("                          SUMMARY")
+        logInfo("=".repeat(66))
+
+        if (generateOriginal.get()) {
+            val originalKeystorePath = File(keystoreDir, originalConfig.get().originalKeystoreName)
+            if (originalResult) {
+                logInfo("ORIGINAL keystore: SUCCESS - ${originalKeystorePath.absolutePath}")
+            } else {
+                logError("ORIGINAL keystore: FAILED")
+            }
+        }
+
+        if (generateUpload.get()) {
+            val uploadKeystorePath = File(keystoreDir, uploadConfig.get().uploadKeystoreName)
+            if (uploadResult) {
+                logInfo("UPLOAD keystore: SUCCESS - ${uploadKeystorePath.absolutePath}")
+            } else {
+                logError("UPLOAD keystore: FAILED")
+            }
+        }
+
+        logInfo("")
+        logInfo("IMPORTANT: Keep these keystore files and their passwords in a safe place.")
+        logInfo("If you lose them, you will not be able to update your application on the Play Store.")
+    }
+
+    companion object {
+        /**
+         * Creates a task with configurations loaded from secrets.env file
+         */
+        fun createWithSecretsConfig(
+            task: KeystoreGenerationTask,
+            secretsConfig: SecretsConfig = SecretsConfig()
+        ) {
+            // Parse secrets.env file if it exists
+            val parser = SecretsEnvParser(secretsConfig)
+            val parseResult = parser.parseFile()
+
+            if (parseResult.isValid) {
+                val secrets = parseResult.allSecrets
+
+                // Apply ORIGINAL keystore configuration from secrets
+                val originalKeystoreConfig = KeystoreConfig(
+                    keystorePassword = secrets[secretsConfig.originalKeystorePasswordKey] 
+                        ?: KeystoreConfig.original().keystorePassword,
+                    keyAlias = secrets[secretsConfig.originalKeystoreAliasKey] 
+                        ?: KeystoreConfig.original().keyAlias,
+                    keyPassword = secrets[secretsConfig.originalKeystoreAliasPasswordKey] 
+                        ?: KeystoreConfig.original().keyPassword,
+                    companyName = secrets["COMPANY_NAME"] ?: KeystoreConfig.original().companyName,
+                    department = secrets["DEPARTMENT"] ?: KeystoreConfig.original().department,
+                    organization = secrets["ORGANIZATION"] ?: KeystoreConfig.original().organization,
+                    city = secrets["CITY"] ?: KeystoreConfig.original().city,
+                    state = secrets["STATE"] ?: KeystoreConfig.original().state,
+                    country = secrets["COUNTRY"] ?: KeystoreConfig.original().country,
+                    keyAlgorithm = secrets["KEYALG"] ?: KeystoreConfig.original().keyAlgorithm,
+                    keySize = secrets["KEYSIZE"]?.toIntOrNull() ?: KeystoreConfig.original().keySize,
+                    validity = secrets["VALIDITY"]?.toIntOrNull() ?: KeystoreConfig.original().validity,
+                    originalKeystoreName = secrets["ORIGINAL_KEYSTORE_NAME"] 
+                        ?: KeystoreConfig.original().originalKeystoreName,
+                    overwriteExisting = secrets["OVERWRITE"]?.toBoolean() 
+                        ?: KeystoreConfig.original().overwriteExisting
+                )
+
+                // Apply UPLOAD keystore configuration from secrets
+                val uploadKeystoreConfig = KeystoreConfig(
+                    keystorePassword = secrets[secretsConfig.uploadKeystorePasswordKey] 
+                        ?: KeystoreConfig.upload().keystorePassword,
+                    keyAlias = secrets[secretsConfig.uploadKeystoreAliasKey] 
+                        ?: KeystoreConfig.upload().keyAlias,
+                    keyPassword = secrets[secretsConfig.uploadKeystoreAliasPasswordKey] 
+                        ?: KeystoreConfig.upload().keyPassword,
+                    companyName = secrets["COMPANY_NAME"] ?: KeystoreConfig.upload().companyName,
+                    department = secrets["DEPARTMENT"] ?: KeystoreConfig.upload().department,
+                    organization = secrets["ORGANIZATION"] ?: KeystoreConfig.upload().organization,
+                    city = secrets["CITY"] ?: KeystoreConfig.upload().city,
+                    state = secrets["STATE"] ?: KeystoreConfig.upload().state,
+                    country = secrets["COUNTRY"] ?: KeystoreConfig.upload().country,
+                    keyAlgorithm = secrets["KEYALG"] ?: KeystoreConfig.upload().keyAlgorithm,
+                    keySize = secrets["KEYSIZE"]?.toIntOrNull() ?: KeystoreConfig.upload().keySize,
+                    validity = secrets["VALIDITY"]?.toIntOrNull() ?: KeystoreConfig.upload().validity,
+                    uploadKeystoreName = secrets["UPLOAD_KEYSTORE_NAME"] 
+                        ?: KeystoreConfig.upload().uploadKeystoreName,
+                    overwriteExisting = secrets["OVERWRITE"]?.toBoolean() 
+                        ?: KeystoreConfig.upload().overwriteExisting
+                )
+
+                task.originalConfig.set(originalKeystoreConfig)
+                task.uploadConfig.set(uploadKeystoreConfig)
+
+                task.logger.lifecycle("[KEYSTORE] Loaded configuration from ${secretsConfig.secretsEnvFile.name}")
+            } else {
+                task.logger.warn("[KEYSTORE] Could not parse ${secretsConfig.secretsEnvFile.name}: ${parseResult.errors}")
+                task.logger.lifecycle("[KEYSTORE] Using default configurations")
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreLogger.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreLogger.kt
new file mode 100644
index 000000000..b0bacd6f7
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/KeystoreLogger.kt
@@ -0,0 +1,46 @@
+package org.convention.keystore
+
+import org.gradle.api.logging.Logger
+
+/**
+ * Utility class for consistent keystore task logging
+ */
+class KeystoreLogger(private val logger: Logger) {
+
+    companion object {
+        private const val PREFIX = "[KEYSTORE]"
+        private const val SEPARATOR = "=============================================================================="
+    }
+
+    fun info(message: String) {
+        logger.lifecycle("$PREFIX $message")
+    }
+
+    fun warning(message: String) {
+        logger.warn("$PREFIX $message")
+    }
+
+    fun error(message: String) {
+        logger.error("$PREFIX $message")
+    }
+
+    fun success(message: String) {
+        logger.lifecycle("$PREFIX ✅ $message")
+    }
+
+    fun section(title: String) {
+        logger.lifecycle("")
+        logger.lifecycle("$PREFIX $SEPARATOR")
+        logger.lifecycle("$PREFIX $title")
+        logger.lifecycle("$PREFIX $SEPARATOR")
+    }
+
+    fun summary(title: String, items: List<Pair<String, Boolean>>) {
+        logger.lifecycle("")
+        section(title)
+        items.forEach { (item, success) ->
+            val status = if (success) "✅ SUCCESS" else "❌ FAILED"
+            logger.lifecycle("$PREFIX $item: $status")
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsConfig.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsConfig.kt
new file mode 100644
index 000000000..aeff903d6
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsConfig.kt
@@ -0,0 +1,65 @@
+package org.convention.keystore
+
+import java.io.File
+
+/**
+ * Configuration for secrets.env file management matching keystore-manager.sh functionality
+ */
+data class SecretsConfig(
+    // File paths
+    val secretsEnvFile: File = File("secrets.env"),
+    val backupDir: File = File("secrets-backup"),
+
+    // GitHub secret names from script
+    val originalKeystorePasswordKey: String = "ORIGINAL_KEYSTORE_FILE_PASSWORD",
+    val originalKeystoreAliasKey: String = "ORIGINAL_KEYSTORE_ALIAS",
+    val originalKeystoreAliasPasswordKey: String = "ORIGINAL_KEYSTORE_ALIAS_PASSWORD",
+    val originalKeystoreFileKey: String = "ORIGINAL_KEYSTORE_FILE",
+
+    val uploadKeystorePasswordKey: String = "UPLOAD_KEYSTORE_FILE_PASSWORD",
+    val uploadKeystoreAliasKey: String = "UPLOAD_KEYSTORE_ALIAS",
+    val uploadKeystoreAliasPasswordKey: String = "UPLOAD_KEYSTORE_ALIAS_PASSWORD",
+    val uploadKeystoreFileKey: String = "UPLOAD_KEYSTORE_FILE",
+
+    // Excluded keys from GitHub (matching script EXCLUDED_GITHUB_KEYS)
+    val excludedGitHubKeys: Set<String> = setOf(
+        "COMPANY_NAME", "DEPARTMENT", "ORGANIZATION", "CITY", "STATE", "COUNTRY",
+        "VALIDITY", "KEYALG", "KEYSIZE", "OVERWRITE",
+        "ORIGINAL_KEYSTORE_NAME", "UPLOAD_KEYSTORE_NAME",
+        "CN", "OU", "O", "L", "ST", "C"
+    ),
+
+    // Base64 encoding settings
+    val base64LineLength: Int = 76,
+    val useHeredocFormat: Boolean = true,
+    val heredocDelimiter: String = "EOF",
+
+    // File processing options
+    val createBackup: Boolean = true,
+    val preserveComments: Boolean = true
+) {
+
+    /**
+     * Checks if a key should be excluded from GitHub secrets
+     */
+    fun isKeyExcluded(key: String): Boolean = excludedGitHubKeys.contains(key)
+
+    /**
+     * Formats a multiline value using heredoc syntax (matching script format)
+     */
+    fun formatMultilineValue(key: String, value: String): String {
+        return if (useHeredocFormat) {
+            "$key<<$heredocDelimiter\n$value\n$heredocDelimiter"
+        } else {
+            val escapedValue = value.replace("\n", "\\n").replace("\"", "\\\"")
+            "$key=\"$escapedValue\""
+        }
+    }
+
+    /**
+     * Gets backup file path with timestamp
+     */
+    fun getBackupFile(timestamp: String = System.currentTimeMillis().toString()): File {
+        return File(backupDir, "secrets.env.backup.$timestamp")
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsEnvParser.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsEnvParser.kt
new file mode 100644
index 000000000..6df5b3749
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsEnvParser.kt
@@ -0,0 +1,243 @@
+package org.convention.keystore
+
+import java.io.File
+
+/**
+ * Parser for secrets.env file with multiline (heredoc) support
+ * Matches the functionality of the keystore-manager.sh script's load_env_vars function
+ */
+class SecretsEnvParser(private val config: SecretsConfig) {
+
+    /**
+     * Parsed result containing all secrets and metadata
+     */
+    data class ParseResult(
+        val secrets: Map<String, String>,
+        val multilineSecrets: Map<String, String>,
+        val comments: List<String>,
+        val errors: List<String>
+    ) {
+        val allSecrets: Map<String, String>
+            get() = secrets + multilineSecrets
+
+        val isValid: Boolean
+            get() = errors.isEmpty()
+    }
+
+    /**
+     * Parses the secrets.env file with full heredoc support
+     * Matches the exact behavior of the bash script's multiline parsing
+     */
+    fun parseFile(file: File = config.secretsEnvFile): ParseResult {
+        if (!file.exists()) {
+            return ParseResult(
+                secrets = emptyMap(),
+                multilineSecrets = emptyMap(),
+                comments = emptyList(),
+                errors = listOf("File not found: ${file.absolutePath}")
+            )
+        }
+
+        val secrets = mutableMapOf<String, String>()
+        val multilineSecrets = mutableMapOf<String, String>()
+        val comments = mutableListOf<String>()
+        val errors = mutableListOf<String>()
+
+        var lineNumber = 0
+        var inMultilineBlock = false
+        var multilineKey = ""
+        var multilineEnd = ""
+        val multilineValue = StringBuilder()
+
+        try {
+            file.forEachLine { line ->
+                lineNumber++
+
+                when {
+                    // Handle multiline block termination
+                    inMultilineBlock && line.trim() == multilineEnd -> {
+                        multilineSecrets[multilineKey] = multilineValue.toString()
+                        inMultilineBlock = false
+                        multilineKey = ""
+                        multilineEnd = ""
+                        multilineValue.clear()
+                    }
+
+                    // Handle content inside multiline blocks
+                    inMultilineBlock -> {
+                        if (multilineValue.isNotEmpty()) {
+                            multilineValue.appendLine()
+                        }
+                        multilineValue.append(line)
+                    }
+
+                    // Skip empty lines and comments when not in multiline mode
+                    line.isBlank() || line.trimStart().startsWith("#") -> {
+                        if (config.preserveComments && line.trimStart().startsWith("#")) {
+                            comments.add(line)
+                        }
+                    }
+
+                    // Check for multiline block start (KEY<<DELIMITER)
+                    line.contains("<<") -> {
+                        val parts = line.split("<<", limit = 2)
+                        if (parts.size == 2) {
+                            multilineKey = parts[0].trim()
+                            multilineEnd = parts[1].trim()
+
+                            if (multilineKey.isBlank()) {
+                                errors.add("Line $lineNumber: Empty key in multiline declaration")
+                            } else if (multilineEnd.isBlank()) {
+                                errors.add("Line $lineNumber: Empty delimiter in multiline declaration")
+                            } else {
+                                inMultilineBlock = true
+                                multilineValue.clear()
+                            }
+                        } else {
+                            errors.add("Line $lineNumber: Invalid multiline syntax")
+                        }
+                    }
+
+                    // Handle regular KEY=VALUE pairs
+                    line.contains("=") -> {
+                        val parts = line.split("=", limit = 2)
+                        if (parts.size == 2) {
+                            val key = parts[0].trim()
+                            val rawValue = parts[1]
+
+                            if (key.isBlank()) {
+                                errors.add("Line $lineNumber: Empty key")
+                            } else {
+                                val cleanValue = stripQuotes(rawValue)
+                                secrets[key] = cleanValue
+                            }
+                        } else {
+                            errors.add("Line $lineNumber: Invalid key=value syntax")
+                        }
+                    }
+
+                    else -> {
+                        errors.add("Line $lineNumber: Unrecognized line format: $line")
+                    }
+                }
+            }
+
+            // Check for unterminated multiline blocks
+            if (inMultilineBlock) {
+                errors.add("Unterminated multiline block. Missing closing delimiter: $multilineEnd")
+            }
+
+        } catch (e: Exception) {
+            errors.add("Failed to read file: ${e.message}")
+        }
+
+        return ParseResult(
+            secrets = secrets,
+            multilineSecrets = multilineSecrets,
+            comments = comments,
+            errors = errors
+        )
+    }
+
+    /**
+     * Strips surrounding quotes from values and handles escape sequences (matches script's strip_quotes function)
+     */
+    private fun stripQuotes(value: String): String {
+        var cleaned = value.trim()
+
+        // Remove surrounding double quotes and handle escape sequences
+        if (cleaned.startsWith("\"") && cleaned.endsWith("\"") && cleaned.length > 1) {
+            cleaned = cleaned.substring(1, cleaned.length - 1)
+            // Unescape common escape sequences in double-quoted strings
+            cleaned = cleaned
+                .replace("\\\"", "\"")  // Unescape double quotes
+                .replace("\\\\", "\\")  // Unescape backslashes
+                .replace("\\n", "\n")   // Unescape newlines
+                .replace("\\t", "\t")   // Unescape tabs
+                .replace("\\r", "\r")   // Unescape carriage returns
+        }
+
+        // Remove surrounding single quotes (no escape sequence processing for single quotes)
+        if (cleaned.startsWith("'") && cleaned.endsWith("'") && cleaned.length > 1) {
+            cleaned = cleaned.substring(1, cleaned.length - 1)
+        }
+
+        return cleaned
+    }
+
+    /**
+     * Creates a formatted table view of secrets (matches script's view_secrets function)
+     */
+    fun formatSecretsTable(parseResult: ParseResult): String {
+        if (!parseResult.isValid) {
+            return "Error parsing secrets file:\n${parseResult.errors.joinToString("\n")}"
+        }
+
+        val keyWidth = 30
+        val valueWidth = 50
+        val totalWidth = keyWidth + valueWidth + 5
+
+        val output = StringBuilder()
+
+        // Table header
+        output.appendLine("═".repeat(totalWidth))
+        output.appendLine("║ %-${keyWidth}s ║ %-${valueWidth}s ║".format("SECRET KEY", "VALUE"))
+        output.appendLine("═".repeat(totalWidth))
+
+        // Regular secrets
+        parseResult.secrets.forEach { (key, value) ->
+            val displayValue = if (value.length > valueWidth) {
+                value.take(valueWidth - 3) + "..."
+            } else {
+                value
+            }
+            output.appendLine("║ %-${keyWidth}s ║ %-${valueWidth}s ║".format(key, displayValue))
+        }
+
+        // Multiline secrets
+        parseResult.multilineSecrets.forEach { (key, _) ->
+            output.appendLine("║ %-${keyWidth}s ║ %-${valueWidth}s ║".format(key, "[MULTILINE VALUE]"))
+        }
+
+        // Table footer
+        output.appendLine("═".repeat(totalWidth))
+
+        return output.toString()
+    }
+
+    /**
+     * Validates that all required keystore secrets are present
+     */
+    fun validateKeystoreSecrets(parseResult: ParseResult): List<String> {
+        val errors = mutableListOf<String>()
+        val allSecrets = parseResult.allSecrets
+
+        // Required ORIGINAL keystore secrets
+        listOf(
+            config.originalKeystorePasswordKey,
+            config.originalKeystoreAliasKey,
+            config.originalKeystoreAliasPasswordKey
+        ).forEach { key ->
+            if (!allSecrets.containsKey(key)) {
+                errors.add("Missing required ORIGINAL keystore secret: $key")
+            } else if (allSecrets[key].isNullOrBlank()) {
+                errors.add("Empty value for required ORIGINAL keystore secret: $key")
+            }
+        }
+
+        // Required UPLOAD keystore secrets
+        listOf(
+            config.uploadKeystorePasswordKey,
+            config.uploadKeystoreAliasKey,
+            config.uploadKeystoreAliasPasswordKey
+        ).forEach { key ->
+            if (!allSecrets.containsKey(key)) {
+                errors.add("Missing required UPLOAD keystore secret: $key")
+            } else if (allSecrets[key].isNullOrBlank()) {
+                errors.add("Empty value for required UPLOAD keystore secret: $key")
+            }
+        }
+
+        return errors
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsEnvUpdateTask.kt b/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsEnvUpdateTask.kt
new file mode 100644
index 000000000..ad9820bc3
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/org/convention/keystore/SecretsEnvUpdateTask.kt
@@ -0,0 +1,598 @@
+package org.convention.keystore
+
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.MapProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.TaskAction
+import org.gradle.work.DisableCachingByDefault
+import java.io.File
+import java.util.Base64
+
+/**
+ * Gradle task for updating secrets.env file with base64-encoded keystores
+ *
+ * This task implements the functionality specified in KMPPT-57:
+ * - Updates secrets.env with base64-encoded keystore content
+ * - Maintains proper heredoc formatting for multiline values
+ * - Preserves existing environment variables
+ * - Handles file creation and updates seamlessly
+ * - Provides base64 encoding functionality
+ * - Implements multiline value formatting with proper heredoc syntax
+ * - Includes file merge logic for existing variables
+ * - Validates output format for GitHub CLI compatibility
+ */
+@DisableCachingByDefault(because = "Secrets file updates should always run")
+abstract class SecretsEnvUpdateTask : BaseKeystoreTask() {
+
+    @get:InputFile
+    @get:Optional
+    @get:PathSensitive(PathSensitivity.ABSOLUTE)
+    abstract val originalKeystoreFile: RegularFileProperty
+
+    @get:InputFile
+    @get:Optional
+    @get:PathSensitive(PathSensitivity.ABSOLUTE)
+    abstract val uploadKeystoreFile: RegularFileProperty
+
+    @get:OutputFile
+    abstract val secretsEnvFile: RegularFileProperty
+
+    @get:Input
+    @get:Optional
+    abstract val additionalSecrets: MapProperty<String, String>
+
+    @get:Input
+    @get:Optional
+    abstract val preserveComments: Property<Boolean>
+
+    @get:Input
+    @get:Optional
+    abstract val createBackup: Property<Boolean>
+
+    @get:Input
+    @get:Optional
+    abstract val validateOutput: Property<Boolean>
+
+    @get:Input
+    @get:Optional
+    abstract val base64LineLength: Property<Int>
+
+    @get:Input
+    @get:Optional
+    abstract val useHeredocFormat: Property<Boolean>
+
+    @get:Input
+    @get:Optional
+    abstract val heredocDelimiter: Property<String>
+
+    init {
+        description = "Updates secrets.env file with base64-encoded keystores and maintains proper formatting"
+
+        // Set default values
+        preserveComments.convention(true)
+        createBackup.convention(true)
+        validateOutput.convention(true)
+        base64LineLength.convention(76)
+        useHeredocFormat.convention(true)
+        heredocDelimiter.convention("EOF")
+        secretsEnvFile.convention(project.layout.projectDirectory.file("secrets.env"))
+        additionalSecrets.convention(emptyMap())
+    }
+
+    @TaskAction
+    fun updateSecretsEnv() {
+        logInfo("Starting secrets.env file update task")
+
+        val secretsFile = secretsEnvFile.asFile.get()
+        val config = secretsConfig.get()
+
+        try {
+            // Validate inputs first
+            validateInputs()
+
+            // Create backup if requested and file exists
+            if (createBackup.get() && secretsFile.exists()) {
+                createBackupFile(secretsFile, config)
+            }
+
+            // Parse existing secrets.env file if it exists
+            val existingSecrets = if (secretsFile.exists()) {
+                parseExistingSecretsFile(secretsFile, config)
+            } else {
+                logInfo("Creating new secrets.env file")
+                ParsedSecretsData()
+            }
+
+            // Encode available keystores to base64
+            val keystoreSecrets = encodeKeystoresToBase64()
+
+            // Merge all secrets
+            val mergedSecrets = mergeSecrets(existingSecrets, keystoreSecrets)
+
+            // Ensure output directory exists
+            secretsFile.parentFile?.mkdirs()
+
+            // Write updated secrets.env file
+            writeSecretsFile(secretsFile, mergedSecrets)
+
+            // Validate output if requested
+            if (validateOutput.get()) {
+                validateSecretsFile(secretsFile, config)
+            }
+
+            logInfo("Secrets.env file updated successfully")
+            printUpdateSummary(keystoreSecrets, mergedSecrets)
+
+        } catch (e: Exception) {
+            logError("Failed to update secrets.env file: ${e.message}")
+            throw e
+        }
+    }
+
+    /**
+     * Data class to hold parsed secrets file content
+     */
+    private data class ParsedSecretsData(
+        val simpleSecrets: MutableMap<String, String> = mutableMapOf(),
+        val multilineSecrets: MutableMap<String, String> = mutableMapOf(),
+        val comments: MutableList<String> = mutableListOf(),
+        val originalOrder: MutableList<String> = mutableListOf(), // Track order of keys
+    )
+
+    /**
+     * Validates task inputs before execution
+     */
+    private fun validateInputs() {
+        val originalFile = originalKeystoreFile.orNull?.asFile
+        val uploadFile = uploadKeystoreFile.orNull?.asFile
+
+        // Check if at least one keystore file is provided and exists
+        val hasValidOriginal = originalFile?.exists() == true
+        val hasValidUpload = uploadFile?.exists() == true
+
+        if (!hasValidOriginal && !hasValidUpload) {
+            logWarning("No valid keystore files found. Task will only process existing secrets and additional secrets.")
+        }
+
+        // Validate file readability
+        originalFile?.let { file ->
+            if (file.exists() && !file.canRead()) {
+                throw IllegalStateException("Cannot read original keystore file: ${file.absolutePath}")
+            }
+        }
+
+        uploadFile?.let { file ->
+            if (file.exists() && !file.canRead()) {
+                throw IllegalStateException("Cannot read upload keystore file: ${file.absolutePath}")
+            }
+        }
+
+        // Validate base64 line length
+        if (base64LineLength.get() < 0) {
+            throw IllegalArgumentException("Base64 line length cannot be negative")
+        }
+
+        // Validate heredoc delimiter
+        if (useHeredocFormat.get() && heredocDelimiter.get().isBlank()) {
+            throw IllegalArgumentException("Heredoc delimiter cannot be blank when heredoc format is enabled")
+        }
+    }
+
+    /**
+     * Creates a backup of the existing secrets file
+     */
+    private fun createBackupFile(secretsFile: File, config: SecretsConfig) {
+        try {
+            val timestamp = System.currentTimeMillis()
+            val backupFile = config.getBackupFile(timestamp.toString())
+
+            if (!ensureDirectoryExists(backupFile.parentFile)) {
+                throw IllegalStateException("Failed to create backup directory: ${backupFile.parentFile.absolutePath}")
+            }
+
+            secretsFile.copyTo(backupFile, overwrite = true)
+            logInfo("Created backup: ${backupFile.absolutePath}")
+        } catch (e: Exception) {
+            logWarning("Failed to create backup: ${e.message}")
+            // Continue execution even if backup fails, unless it's critical
+        }
+    }
+
+    /**
+     * Parses existing secrets.env file while preserving structure and comments
+     */
+    private fun parseExistingSecretsFile(secretsFile: File, config: SecretsConfig): ParsedSecretsData {
+        try {
+            val parser = SecretsEnvParser(config)
+            val parseResult = parser.parseFile(secretsFile)
+
+            if (!parseResult.isValid) {
+                logWarning("Issues parsing existing secrets file:")
+                parseResult.errors.forEach { error -> logWarning("  - $error") }
+                logWarning("Continuing with partial parsing...")
+            }
+
+            val parsedData = ParsedSecretsData()
+
+            // Add simple secrets
+            parseResult.secrets.forEach { (key, value) ->
+                parsedData.simpleSecrets[key] = value
+                parsedData.originalOrder.add(key)
+            }
+
+            // Add multiline secrets
+            parseResult.multilineSecrets.forEach { (key, value) ->
+                parsedData.multilineSecrets[key] = value
+                parsedData.originalOrder.add(key)
+            }
+
+            // Preserve comments if requested
+            if (preserveComments.get()) {
+                parsedData.comments.addAll(parseResult.comments)
+            }
+
+            logInfo("Parsed existing secrets file: ${parsedData.simpleSecrets.size} simple + ${parsedData.multilineSecrets.size} multiline secrets")
+            return parsedData
+
+        } catch (e: Exception) {
+            logError("Failed to parse existing secrets file: ${e.message}")
+            logWarning("Starting with empty secrets data")
+            return ParsedSecretsData()
+        }
+    }
+
+    /**
+     * Encodes available keystores to base64 format
+     */
+    private fun encodeKeystoresToBase64(): Map<String, String> {
+        val keystoreSecrets = mutableMapOf<String, String>()
+        val config = secretsConfig.get()
+
+        // Encode original keystore if provided and exists
+        originalKeystoreFile.orNull?.asFile?.let { file ->
+            when {
+                !file.exists() -> {
+                    logInfo("Original keystore file not found: ${file.absolutePath}")
+                }
+
+                file.length() == 0L -> {
+                    logWarning("Original keystore file is empty: ${file.absolutePath}")
+                }
+
+                file.length() > 50 * 1024 * 1024 -> { // 50MB limit
+                    logWarning("Original keystore file is very large (${file.length() / (1024 * 1024)}MB): ${file.absolutePath}")
+                    val base64Content = encodeFileToBase64(file)
+                    keystoreSecrets[config.originalKeystoreFileKey] = base64Content
+                    logInfo("Encoded ORIGINAL keystore: ${file.name}")
+                }
+
+                else -> {
+                    val base64Content = encodeFileToBase64(file)
+                    keystoreSecrets[config.originalKeystoreFileKey] = base64Content
+                    logInfo("Encoded ORIGINAL keystore: ${file.name}")
+                }
+            }
+        }
+
+        // Encode upload keystore if provided and exists
+        uploadKeystoreFile.orNull?.asFile?.let { file ->
+            when {
+                !file.exists() -> {
+                    logInfo("Upload keystore file not found: ${file.absolutePath}")
+                }
+
+                file.length() == 0L -> {
+                    logWarning("Upload keystore file is empty: ${file.absolutePath}")
+                }
+
+                file.length() > 50 * 1024 * 1024 -> { // 50MB limit
+                    logWarning("Upload keystore file is very large (${file.length() / (1024 * 1024)}MB): ${file.absolutePath}")
+                    val base64Content = encodeFileToBase64(file)
+                    keystoreSecrets[config.uploadKeystoreFileKey] = base64Content
+                    logInfo("Encoded UPLOAD keystore: ${file.name}")
+                }
+
+                else -> {
+                    val base64Content = encodeFileToBase64(file)
+                    keystoreSecrets[config.uploadKeystoreFileKey] = base64Content
+                    logInfo("Encoded UPLOAD keystore: ${file.name}")
+                }
+            }
+        }
+
+        return keystoreSecrets
+    }
+
+    /**
+     * Encodes a file to base64 with proper line wrapping and error handling
+     */
+    private fun encodeFileToBase64(file: File): String {
+        try {
+            val bytes = file.readBytes()
+            val base64String = Base64.getEncoder().encodeToString(bytes)
+
+            return if (base64LineLength.get() > 0) {
+                // Wrap lines to specified length for better readability
+                base64String.chunked(base64LineLength.get()).joinToString("\n")
+            } else {
+                base64String
+            }
+        } catch (e: Exception) {
+            logError("Failed to encode file to base64: ${file.absolutePath}")
+            throw IllegalStateException("Failed to encode keystore file: ${e.message}", e)
+        }
+    }
+
+    /**
+     * Merges existing secrets with new keystore secrets and additional secrets
+     */
+    private fun mergeSecrets(
+        existingSecrets: ParsedSecretsData,
+        keystoreSecrets: Map<String, String>,
+    ): ParsedSecretsData {
+        val mergedSecrets = ParsedSecretsData()
+
+        // Copy existing secrets (preserving order)
+        existingSecrets.originalOrder.forEach { key ->
+            when {
+                existingSecrets.simpleSecrets.containsKey(key) -> {
+                    mergedSecrets.simpleSecrets[key] = existingSecrets.simpleSecrets[key]!!
+                    mergedSecrets.originalOrder.add(key)
+                }
+
+                existingSecrets.multilineSecrets.containsKey(key) -> {
+                    mergedSecrets.multilineSecrets[key] = existingSecrets.multilineSecrets[key]!!
+                    mergedSecrets.originalOrder.add(key)
+                }
+            }
+        }
+
+        // Add or update keystore secrets (as multiline)
+        keystoreSecrets.forEach { (key, value) ->
+            if (mergedSecrets.originalOrder.contains(key)) {
+                // Update existing keystore secret
+                mergedSecrets.multilineSecrets[key] = value
+                // Remove from simple secrets if it was there before
+                mergedSecrets.simpleSecrets.remove(key)
+                logInfo("Updated existing keystore secret: $key")
+            } else {
+                // Add new keystore secret
+                mergedSecrets.multilineSecrets[key] = value
+                mergedSecrets.originalOrder.add(key)
+                logInfo("Added new keystore secret: $key")
+            }
+        }
+
+        // Add additional secrets
+        additionalSecrets.get().forEach { (key, value) ->
+            if (!mergedSecrets.originalOrder.contains(key)) {
+                mergedSecrets.simpleSecrets[key] = value
+                mergedSecrets.originalOrder.add(key)
+                logInfo("Added additional secret: $key")
+            } else {
+                logWarning("Additional secret '$key' conflicts with existing secret, skipping")
+            }
+        }
+
+        // Preserve comments
+        mergedSecrets.comments.addAll(existingSecrets.comments)
+
+        return mergedSecrets
+    }
+
+    /**
+     * Writes the merged secrets to the secrets.env file with proper formatting
+     */
+    private fun writeSecretsFile(
+        secretsFile: File,
+        secrets: ParsedSecretsData,
+    ) {
+        try {
+            secretsFile.printWriter().use { writer ->
+                // Write header comment if it's a new file or no comments exist
+                if (!secretsFile.exists() || secrets.comments.isEmpty()) {
+                    writer.println("# GitHub Secrets Environment File")
+                    writer.println("# Generated by Gradle Keystore Management Plugin")
+                    writer.println("# Format: KEY=VALUE")
+                    writer.println("# Use <<EOF and EOF to denote multiline values")
+                    writer.println("# Run this command to format these secrets: dos2unix secrets.env")
+                    writer.println()
+                }
+
+                // Write preserved comments
+                if (preserveComments.get() && secrets.comments.isNotEmpty()) {
+                    secrets.comments.forEach { comment ->
+                        writer.println(comment)
+                    }
+                    writer.println()
+                }
+
+                // Write secrets in preserved order
+                secrets.originalOrder.forEach { key ->
+                    when {
+                        secrets.simpleSecrets.containsKey(key) -> {
+                            val value = secrets.simpleSecrets[key]!!
+                            writer.println("$key=${quoteValueIfNeeded(value)}")
+                        }
+
+                        secrets.multilineSecrets.containsKey(key) -> {
+                            val value = secrets.multilineSecrets[key]!!
+                            if (useHeredocFormat.get()) {
+                                writer.println("$key<<${heredocDelimiter.get()}")
+                                writer.println(value)
+                                writer.println(heredocDelimiter.get())
+                            } else {
+                                // Fallback to escaped format
+                                val escapedValue = value.replace("\n", "\\n").replace("\"", "\\\"")
+                                writer.println("$key=\"$escapedValue\"")
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (e: Exception) {
+            throw IllegalStateException("Failed to write secrets file: ${secretsFile.absolutePath}", e)
+        }
+    }
+
+    /**
+     * Quotes value if it contains spaces or special characters
+     */
+    private fun quoteValueIfNeeded(value: String): String {
+        return if (value.contains(" ") || value.contains("\t") || value.contains("\n") || value.contains("\"")) {
+            // Escape quotes in the value
+            val escapedValue = value.replace("\"", "\\\"")
+            "\"$escapedValue\""
+        } else {
+            value
+        }
+    }
+
+    /**
+     * Validates the generated secrets file for GitHub CLI compatibility
+     */
+    private fun validateSecretsFile(secretsFile: File, config: SecretsConfig) {
+        logInfo("Validating secrets.env file format...")
+
+        try {
+            val parser = SecretsEnvParser(config)
+            val parseResult = parser.parseFile(secretsFile)
+
+            if (parseResult.isValid) {
+                logInfo("✅ Secrets file validation passed")
+
+                // Additional GitHub CLI compatibility checks
+                val allSecrets = parseResult.allSecrets
+                val warnings = mutableListOf<String>()
+
+                // Check for potential GitHub CLI issues
+                allSecrets.forEach { (key, value) ->
+                    when {
+                        key.contains(" ") -> warnings.add("Key '$key' contains spaces")
+                        key.contains("-") -> warnings.add("Key '$key' contains hyphens (consider using underscores)")
+                        !key.matches(Regex("[A-Z_][A-Z0-9_]*")) -> warnings.add("Key '$key' doesn't follow UPPER_SNAKE_CASE convention")
+                        value.isEmpty() -> warnings.add("Key '$key' has empty value")
+                        key.length > 100 -> warnings.add("Key '$key' is very long (${key.length} chars)")
+                        value.length > 1024 * 1024 -> warnings.add("Value for '$key' is very large (${value.length / 1024}KB)")
+                    }
+                }
+
+                if (warnings.isNotEmpty()) {
+                    logWarning("GitHub CLI compatibility warnings:")
+                    warnings.forEach { warning -> logWarning("  - $warning") }
+                } else {
+                    logInfo("✅ No GitHub CLI compatibility issues found")
+                }
+
+            } else {
+                logError("❌ Secrets file validation failed:")
+                parseResult.errors.forEach { error -> logError("  - $error") }
+                throw IllegalStateException("Generated secrets.env file is invalid: ${parseResult.errors.joinToString("/")} ")
+            }
+        } catch (e: Exception) {
+            logError("Failed to validate secrets file: ${e.message}")
+            throw e
+        }
+    }
+
+    /**
+     * Prints a summary of the update operation
+     */
+    private fun printUpdateSummary(keystoreSecrets: Map<String, String>, finalSecrets: ParsedSecretsData) {
+        logInfo("")
+        logInfo("=".repeat(66))
+        logInfo("                    UPDATE SUMMARY")
+        logInfo("=".repeat(66))
+
+        if (keystoreSecrets.isNotEmpty()) {
+            logInfo("Keystore secrets added/updated:")
+            keystoreSecrets.forEach { (key, _) ->
+                logInfo("  ✅ $key")
+            }
+        } else {
+            logInfo("No keystore secrets processed")
+        }
+
+        val totalSecrets = finalSecrets.simpleSecrets.size + finalSecrets.multilineSecrets.size
+        logInfo("")
+        logInfo("Total secrets in file: $totalSecrets")
+        logInfo("  - Simple secrets: ${finalSecrets.simpleSecrets.size}")
+        logInfo("  - Multiline secrets: ${finalSecrets.multilineSecrets.size}")
+
+        if (preserveComments.get() && finalSecrets.comments.isNotEmpty()) {
+            logInfo("  - Comments preserved: ${finalSecrets.comments.size}")
+        }
+
+        logInfo("")
+        logInfo("File location: ${secretsEnvFile.asFile.get().absolutePath}")
+
+        if (createBackup.get()) {
+            logInfo("Backup directory: ${secretsConfig.get().backupDir.absolutePath}")
+        }
+
+        logInfo("")
+        logInfo("✅ Secrets.env file ready for GitHub CLI integration")
+    }
+
+    companion object {
+        /**
+         * Creates a task configured to update secrets from keystore generation task
+         */
+        fun createFromKeystoreGeneration(
+            task: SecretsEnvUpdateTask,
+            keystoreGenerationTask: KeystoreGenerationTask,
+            secretsConfig: SecretsConfig = SecretsConfig(),
+        ) {
+            // Set keystore files from generation task output
+            val originalKeystoreFile = keystoreGenerationTask.outputDirectory.file(
+                keystoreGenerationTask.originalConfig.map { it.originalKeystoreName },
+            )
+            val uploadKeystoreFile = keystoreGenerationTask.outputDirectory.file(
+                keystoreGenerationTask.uploadConfig.map { it.uploadKeystoreName },
+            )
+
+            task.originalKeystoreFile.set(originalKeystoreFile)
+            task.uploadKeystoreFile.set(uploadKeystoreFile)
+            task.secretsConfig.set(secretsConfig)
+
+            // Make this task depend on keystore generation
+            task.dependsOn(keystoreGenerationTask)
+        }
+
+        /**
+         * Creates a task with explicit keystore file paths
+         */
+        fun createWithKeystoreFiles(
+            task: SecretsEnvUpdateTask,
+            originalKeystoreFile: File?,
+            uploadKeystoreFile: File?,
+            secretsConfig: SecretsConfig = SecretsConfig(),
+        ) {
+            originalKeystoreFile?.let { file ->
+                task.originalKeystoreFile.set(file)
+            }
+            uploadKeystoreFile?.let { file ->
+                task.uploadKeystoreFile.set(file)
+            }
+            task.secretsConfig.set(secretsConfig)
+        }
+
+        /**
+         * Creates a task with additional environment secrets
+         */
+        fun createWithAdditionalSecrets(
+            task: SecretsEnvUpdateTask,
+            additionalSecrets: Map<String, String>,
+            secretsConfig: SecretsConfig = SecretsConfig(),
+        ) {
+            task.additionalSecrets.set(additionalSecrets)
+            task.secretsConfig.set(secretsConfig)
+        }
+    }
+}
diff --git a/build-logic/convention/src/test/kotlin/org/convention/keystore/ConfigurationFileUpdatesTaskTest.kt b/build-logic/convention/src/test/kotlin/org/convention/keystore/ConfigurationFileUpdatesTaskTest.kt
new file mode 100644
index 000000000..f87e8a388
--- /dev/null
+++ b/build-logic/convention/src/test/kotlin/org/convention/keystore/ConfigurationFileUpdatesTaskTest.kt
@@ -0,0 +1,364 @@
+package org.convention.keystore
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assertions.assertDoesNotThrow
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+import java.nio.file.Path
+
+/**
+ * Unit tests for ConfigurationFileUpdatesTask
+ */
+class ConfigurationFileUpdatesTaskTest {
+
+    @TempDir
+    lateinit var tempDir: Path
+
+    private lateinit var testConfig: KeystoreConfig
+    private lateinit var keystoreFile: File
+
+    @BeforeEach
+    fun setUp() {
+        testConfig = KeystoreConfig(
+            keystorePassword = "test_password",
+            keyAlias = "test_alias",
+            keyPassword = "test_key_password",
+            companyName = "Test Company",
+            department = "Test Department",
+            organization = "Test Organization",
+            city = "Test City",
+            state = "Test State",
+            country = "US",
+            uploadKeystoreName = "test_upload.keystore"
+        )
+
+        // Create a test keystore file
+        keystoreFile = tempDir.resolve("keystores").resolve("test_upload.keystore").toFile()
+        keystoreFile.parentFile.mkdirs()
+        keystoreFile.writeText("test keystore content")
+    }
+
+    @AfterEach
+    fun tearDown() {
+        // Cleanup handled by @TempDir
+    }
+
+    @Test
+    fun `test fastlane config creation with new file`() {
+        val fastlaneFile = tempDir.resolve("fastlane-config").resolve("android_config.rb").toFile()
+
+        // Create task instance (simplified for testing)
+        val task = TestConfigurationFileUpdatesTask()
+
+        // Test creating new fastlane config
+        task.testCreateNewFastlaneConfig(fastlaneFile, testConfig, "test_upload.keystore")
+
+        assertTrue(fastlaneFile.exists(), "Fastlane config file should be created")
+
+        val content = fastlaneFile.readText()
+        assertFastlaneConfigContent(content, testConfig, "test_upload.keystore")
+    }
+
+    @Test
+    fun `test fastlane config update with existing file`() {
+        val fastlaneFile = tempDir.resolve("fastlane-config").resolve("android_config.rb").toFile()
+        fastlaneFile.parentFile.mkdirs()
+
+        // Create existing file with old values
+        val existingContent = """
+module FastlaneConfig
+  module AndroidConfig
+    STORE_CONFIG = {
+      default_store_file: "old_keystore.keystore",
+      default_store_password: "old_password",
+      default_key_alias: "old_alias",
+      default_key_password: "old_key_password"
+    }
+
+    FIREBASE_CONFIG = {
+      firebase_prod_app_id: "existing_app_id",
+      firebase_demo_app_id: "existing_demo_id",
+      firebase_service_creds_file: "existing_creds.json",
+      firebase_groups: "existing_groups"
+    }
+
+    BUILD_PATHS = {
+      prod_apk_path: "existing/path.apk",
+      demo_apk_path: "existing/demo.apk",
+      prod_aab_path: "existing/bundle.aab"
+    }
+  end
+end
+        """.trimIndent()
+
+        fastlaneFile.writeText(existingContent)
+
+        // Create task instance (simplified for testing)
+        val task = TestConfigurationFileUpdatesTask()
+
+        // Test updating existing fastlane config
+        task.testUpdateExistingFastlaneConfig(fastlaneFile, testConfig, "test_upload.keystore")
+
+        val updatedContent = fastlaneFile.readText()
+
+        // Verify keystore config was updated
+        assertTrue(updatedContent.contains("default_store_file: \"test_upload.keystore\""))
+        assertTrue(updatedContent.contains("default_store_password: \"${testConfig.keystorePassword}\""))
+        assertTrue(updatedContent.contains("default_key_alias: \"${testConfig.keyAlias}\""))
+        assertTrue(updatedContent.contains("default_key_password: \"${testConfig.keyPassword}\""))
+
+        // Verify other sections were preserved
+        assertTrue(updatedContent.contains("firebase_prod_app_id: \"existing_app_id\""))
+        assertTrue(updatedContent.contains("prod_apk_path: \"existing/path.apk\""))
+    }
+
+    @Test
+    fun `test gradle config update with existing file`() {
+        val gradleFile = tempDir.resolve("cmp-android").resolve("build.gradle.kts").toFile()
+        gradleFile.parentFile.mkdirs()
+
+        // Create existing gradle file content
+        val existingContent = """
+android {
+    signingConfigs {
+        create("release") {
+            storeFile = file(System.getenv("KEYSTORE_PATH") ?: "../keystores/old_keystore.keystore")
+            storePassword = System.getenv("KEYSTORE_PASSWORD") ?: "old_password"
+            keyAlias = System.getenv("KEYSTORE_ALIAS") ?: "old_alias"
+            keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD") ?: "old_key_password"
+            enableV1Signing = true
+            enableV2Signing = true
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig = signingConfigs.getByName("release")
+        }
+    }
+}
+        """.trimIndent()
+
+        gradleFile.writeText(existingContent)
+
+        // Create task instance (simplified for testing)
+        val task = TestConfigurationFileUpdatesTask()
+
+        // Test updating gradle config
+        task.testUpdateGradleConfig(gradleFile, testConfig, keystoreFile)
+
+        val updatedContent = gradleFile.readText()
+
+        // Verify gradle config was updated with relative path
+        assertTrue(updatedContent.contains("storeFile = file(System.getenv(\"KEYSTORE_PATH\") ?: \"../keystores/test_upload.keystore\")"))
+        assertTrue(updatedContent.contains("storePassword = System.getenv(\"KEYSTORE_PASSWORD\") ?: \"${testConfig.keystorePassword}\""))
+        assertTrue(updatedContent.contains("keyAlias = System.getenv(\"KEYSTORE_ALIAS\") ?: \"${testConfig.keyAlias}\""))
+        assertTrue(updatedContent.contains("keyPassword = System.getenv(\"KEYSTORE_ALIAS_PASSWORD\") ?: \"${testConfig.keyPassword}\""))
+
+        // Verify other parts were preserved
+        assertTrue(updatedContent.contains("enableV1Signing = true"))
+        assertTrue(updatedContent.contains("enableV2Signing = true"))
+    }
+
+    @Test
+    fun `test gradle config update with missing file`() {
+        val gradleFile = tempDir.resolve("cmp-android").resolve("build.gradle.kts").toFile()
+
+        // Create task instance (simplified for testing)
+        val task = TestConfigurationFileUpdatesTask()
+
+        // Test updating non-existent gradle config (should not throw exception)
+        assertDoesNotThrow {
+            task.testUpdateGradleConfig(gradleFile, testConfig, keystoreFile)
+        }
+
+        // File should still not exist
+        assertFalse(gradleFile.exists())
+    }
+
+    @Test
+    fun `test keystore configuration validation`() {
+        val invalidConfig = KeystoreConfig(
+            keystorePassword = "", // Invalid: empty password
+            keyAlias = "", // Invalid: empty alias
+            keyPassword = "valid_password",
+            keySize = 512, // Invalid: too small
+            validity = -5, // Invalid: negative
+            country = "USA" // Invalid: not 2 characters
+        )
+
+        val errors = invalidConfig.validate()
+
+        assertTrue(errors.contains("Keystore password cannot be blank"))
+        assertTrue(errors.contains("Key alias cannot be blank"))
+        assertTrue(errors.contains("Key size must be at least 1024 bits"))
+        assertTrue(errors.contains("Validity period must be positive"))
+        assertTrue(errors.contains("Country code must be exactly 2 characters"))
+    }
+
+    @Test
+    fun `test keystore path resolution`() {
+        val gradleDir = tempDir.resolve("cmp-android").toFile()
+        gradleDir.mkdirs()
+
+        val task = TestConfigurationFileUpdatesTask()
+
+        // Test with keystore file in different location
+        val keystoreInRootDir = tempDir.resolve("upload.keystore").toFile()
+        keystoreInRootDir.writeText("test content")
+
+        val relativePath = task.testCalculateRelativePath(gradleDir, keystoreInRootDir)
+
+        // Should be relative path from cmp-android to root
+        assertEquals("../upload.keystore", relativePath)
+    }
+
+    @Test
+    fun `test configuration parsing from secrets`() {
+        // Create a test secrets.env file
+        val secretsFile = tempDir.resolve("secrets.env").toFile()
+        val secretsContent = """
+# Test secrets file
+UPLOAD_KEYSTORE_FILE_PASSWORD=secret_password
+UPLOAD_KEYSTORE_ALIAS=secret_alias
+UPLOAD_KEYSTORE_ALIAS_PASSWORD=secret_key_password
+COMPANY_NAME=Secret Company
+DEPARTMENT=Secret Department
+ORGANIZATION=Secret Organization
+CITY=Secret City
+STATE=Secret State
+COUNTRY=US
+UPLOAD_KEYSTORE_NAME=secret_upload.keystore
+        """.trimIndent()
+
+        secretsFile.writeText(secretsContent)
+
+        val secretsConfig = SecretsConfig(secretsEnvFile = secretsFile)
+        val parser = SecretsEnvParser(secretsConfig)
+        val parseResult = parser.parseFile()
+
+        assertTrue(parseResult.isValid)
+
+        val secrets = parseResult.allSecrets
+        assertEquals("secret_password", secrets["UPLOAD_KEYSTORE_FILE_PASSWORD"])
+        assertEquals("secret_alias", secrets["UPLOAD_KEYSTORE_ALIAS"])
+        assertEquals("secret_key_password", secrets["UPLOAD_KEYSTORE_ALIAS_PASSWORD"])
+        assertEquals("Secret Company", secrets["COMPANY_NAME"])
+        assertEquals("secret_upload.keystore", secrets["UPLOAD_KEYSTORE_NAME"])
+    }
+
+    private fun assertFastlaneConfigContent(content: String, config: KeystoreConfig, keystoreName: String) {
+        assertTrue(content.contains("module FastlaneConfig"))
+        assertTrue(content.contains("module AndroidConfig"))
+        assertTrue(content.contains("STORE_CONFIG = {"))
+        assertTrue(content.contains("default_store_file: \"$keystoreName\""))
+        assertTrue(content.contains("default_store_password: \"${config.keystorePassword}\""))
+        assertTrue(content.contains("default_key_alias: \"${config.keyAlias}\""))
+        assertTrue(content.contains("default_key_password: \"${config.keyPassword}\""))
+
+        // Should also contain other required sections
+        assertTrue(content.contains("FIREBASE_CONFIG = {"))
+        assertTrue(content.contains("BUILD_PATHS = {"))
+    }
+
+    /**
+     * Test helper class that exposes private methods for testing
+     */
+    private class TestConfigurationFileUpdatesTask {
+
+        fun testCreateNewFastlaneConfig(configFile: File, config: KeystoreConfig, keystoreName: String) {
+            val content = """
+module FastlaneConfig
+  module AndroidConfig
+    STORE_CONFIG = {
+      default_store_file: "$keystoreName",
+      default_store_password: "${config.keystorePassword}",
+      default_key_alias: "${config.keyAlias}",
+      default_key_password: "${config.keyPassword}"
+    }
+
+    FIREBASE_CONFIG = {
+      firebase_prod_app_id: "1:728433984912738:android:3902eb32kjaska3363b0938f1a1dbb",
+      firebase_demo_app_id: "1:72843493212738:android:8392hjks3298ak9032skja",
+      firebase_service_creds_file: "secrets/firebaseAppDistributionServiceCredentialsFile.json",
+      firebase_groups: "mifos-mobile-apps"
+    }
+
+    BUILD_PATHS = {
+      prod_apk_path: "cmp-android/build/outputs/apk/prod/release/cmp-android-prod-release.apk",
+      demo_apk_path: "cmp-android/build/outputs/apk/demo/release/cmp-android-demo-release.apk",
+      prod_aab_path: "cmp-android/build/outputs/bundle/prodRelease/cmp-android-prod-release.aab"
+    }
+  end
+end
+            """.trimIndent()
+
+            configFile.parentFile.mkdirs()
+            configFile.writeText(content)
+        }
+
+        fun testUpdateExistingFastlaneConfig(configFile: File, config: KeystoreConfig, keystoreName: String) {
+            val content = configFile.readText()
+
+            // Use regex to replace the values while preserving file structure
+            val updatedContent = content
+                .replace(Regex("default_store_file:\\s*\"[^\"]*\""), "default_store_file: \"$keystoreName\"")
+                .replace(Regex("default_store_password:\\s*\"[^\"]*\""), "default_store_password: \"${config.keystorePassword}\"")
+                .replace(Regex("default_key_alias:\\s*\"[^\"]*\""), "default_key_alias: \"${config.keyAlias}\"")
+                .replace(Regex("default_key_password:\\s*\"[^\"]*\""), "default_key_password: \"${config.keyPassword}\"")
+
+            configFile.writeText(updatedContent)
+        }
+
+        fun testUpdateGradleConfig(gradleFile: File, config: KeystoreConfig, keystoreFile: File?) {
+            // Check if the file exists
+            if (!gradleFile.exists()) {
+                // Simulate the warning and return (matches actual implementation)
+                return
+            }
+
+            // Determine keystore path - use relative path from cmp-android directory
+            val keystorePath = if (keystoreFile != null) {
+                val gradleDir = gradleFile.parentFile
+                val relativePath = gradleDir.toPath().relativize(keystoreFile.toPath()).toString()
+                relativePath.replace('\\', '/') // Ensure forward slashes for Gradle
+            } else {
+                "../keystores/${config.uploadKeystoreName}"
+            }
+
+            // Read the current content
+            val content = gradleFile.readText()
+
+            // Use regex to update the signing configuration lines
+            val updatedContent = content
+                .replace(
+                    Regex("storeFile = file\\(System\\.getenv\\(\"KEYSTORE_PATH\"\\) \\?\\: \"[^\"]*\"\\)"),
+                    "storeFile = file(System.getenv(\"KEYSTORE_PATH\") ?: \"$keystorePath\")"
+                )
+                .replace(
+                    Regex("storePassword = System\\.getenv\\(\"KEYSTORE_PASSWORD\"\\) \\?\\: \"[^\"]*\""),
+                    "storePassword = System.getenv(\"KEYSTORE_PASSWORD\") ?: \"${config.keystorePassword}\""
+                )
+                .replace(
+                    Regex("keyAlias = System\\.getenv\\(\"KEYSTORE_ALIAS\"\\) \\?\\: \"[^\"]*\""),
+                    "keyAlias = System.getenv(\"KEYSTORE_ALIAS\") ?: \"${config.keyAlias}\""
+                )
+                .replace(
+                    Regex("keyPassword = System\\.getenv\\(\"KEYSTORE_ALIAS_PASSWORD\"\\) \\?\\: \"[^\"]*\""),
+                    "keyPassword = System.getenv(\"KEYSTORE_ALIAS_PASSWORD\") ?: \"${config.keyPassword}\""
+                )
+
+            gradleFile.writeText(updatedContent)
+        }
+
+        fun testCalculateRelativePath(fromDir: File, toFile: File): String {
+            val relativePath = fromDir.toPath().relativize(toFile.toPath()).toString()
+            return relativePath.replace('\\', '/') // Ensure forward slashes for Gradle
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/test/kotlin/org/convention/keystore/KeystoreGenerationTaskTest.kt b/build-logic/convention/src/test/kotlin/org/convention/keystore/KeystoreGenerationTaskTest.kt
new file mode 100644
index 000000000..b751107f3
--- /dev/null
+++ b/build-logic/convention/src/test/kotlin/org/convention/keystore/KeystoreGenerationTaskTest.kt
@@ -0,0 +1,306 @@
+package org.convention.keystore
+
+import org.gradle.api.Project
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+
+/**
+ * Tests for KeystoreGenerationTask
+ */
+class KeystoreGenerationTaskTest {
+
+    @TempDir
+    lateinit var tempDir: File
+
+    private lateinit var project: Project
+    private lateinit var task: KeystoreGenerationTask
+
+    @BeforeEach
+    fun setup() {
+        project = ProjectBuilder.builder()
+            .withProjectDir(tempDir)
+            .build()
+
+        task = project.tasks.register("testGenerateKeystores", KeystoreGenerationTask::class.java).get()
+    }
+
+    @Test
+    fun `task is created with correct configuration`() {
+        // Verify task is configured correctly
+        assertEquals("keystore", task.group)
+        assertTrue(task.description.contains("Generates Android keystores"))
+        assertTrue(task.generateOriginal.get())
+        assertTrue(task.generateUpload.get())
+    }
+
+    @Test
+    fun `task has correct default configurations`() {
+        // Verify default configurations
+        val originalConfig = task.originalConfig.get()
+        val uploadConfig = task.uploadConfig.get()
+
+        // Check ORIGINAL keystore defaults
+        assertEquals("androiddebugkey", originalConfig.keyAlias)
+        assertEquals("original.keystore", originalConfig.originalKeystoreName)
+        assertEquals("Android Debug", originalConfig.companyName)
+
+        // Check UPLOAD keystore defaults
+        assertEquals("upload", uploadConfig.keyAlias)
+        assertEquals("upload.keystore", uploadConfig.uploadKeystoreName)
+        assertEquals("Android Release", uploadConfig.companyName)
+    }
+
+    @Test
+    fun `task creates correct output directory`() {
+        // Set a custom output directory
+        val outputDir = File(tempDir, "custom-keystores")
+        task.outputDirectory.set(outputDir)
+
+        assertEquals(outputDir, task.outputDirectory.asFile.get())
+    }
+
+    @Test
+    fun `task builds correct distinguished name from config`() {
+        val config = KeystoreConfig(
+            keystorePassword = "testpass",
+            keyAlias = "testalias",
+            keyPassword = "keypass",
+            keyAlgorithm = "RSA",
+            keySize = 2048,
+            validity = 25,
+            companyName = "Test Company",
+            department = "Test Dept",
+            organization = "Test Org",
+            city = "Test City",
+            state = "Test State",
+            country = "US"
+        )
+
+        task.originalConfig.set(config)
+        
+        // Verify distinguished name construction
+        val expectedDN = "CN=Test Company, OU=Test Dept, O=Test Org, L=Test City, ST=Test State, C=US"
+        assertEquals(expectedDN, config.distinguishedName)
+        assertEquals(config, task.originalConfig.get())
+    }
+
+    @Test
+    fun `configuration loading from secrets works correctly`() {
+        // Create a test secrets.env file
+        val secretsFile = File(tempDir, "secrets.env")
+        secretsFile.writeText("""
+            # Test secrets file
+            ORIGINAL_KEYSTORE_FILE_PASSWORD=original_password
+            ORIGINAL_KEYSTORE_ALIAS=original_alias
+            ORIGINAL_KEYSTORE_ALIAS_PASSWORD=original_alias_password
+            
+            UPLOAD_KEYSTORE_FILE_PASSWORD=upload_password
+            UPLOAD_KEYSTORE_ALIAS=upload_alias
+            UPLOAD_KEYSTORE_ALIAS_PASSWORD=upload_alias_password
+            
+            COMPANY_NAME=Test Company From Secrets
+            DEPARTMENT=Test Department
+            ORGANIZATION=Test Organization
+            CITY=Test City
+            STATE=Test State
+            COUNTRY=TS
+            
+            KEYALG=RSA
+            KEYSIZE=4096
+            VALIDITY=30
+            OVERWRITE=true
+        """.trimIndent())
+
+        // Create SecretsConfig pointing to our test file
+        val secretsConfig = SecretsConfig(secretsEnvFile = secretsFile)
+
+        // Apply configuration from secrets
+        KeystoreGenerationTask.createWithSecretsConfig(task, secretsConfig)
+
+        // Verify configurations were loaded
+        val originalConfig = task.originalConfig.get()
+        val uploadConfig = task.uploadConfig.get()
+
+        // Check ORIGINAL keystore configuration
+        assertEquals("original_password", originalConfig.keystorePassword)
+        assertEquals("original_alias", originalConfig.keyAlias)
+        assertEquals("original_alias_password", originalConfig.keyPassword)
+        assertEquals("Test Company From Secrets", originalConfig.companyName)
+        assertEquals("Test Department", originalConfig.department)
+        assertEquals("Test Organization", originalConfig.organization)
+        assertEquals("Test City", originalConfig.city)
+        assertEquals("Test State", originalConfig.state)
+        assertEquals("TS", originalConfig.country)
+        assertEquals("RSA", originalConfig.keyAlgorithm)
+        assertEquals(4096, originalConfig.keySize)
+        assertEquals(30, originalConfig.validity)
+        assertTrue(originalConfig.overwriteExisting)
+
+        // Check UPLOAD keystore configuration
+        assertEquals("upload_password", uploadConfig.keystorePassword)
+        assertEquals("upload_alias", uploadConfig.keyAlias)
+        assertEquals("upload_alias_password", uploadConfig.keyPassword)
+        assertEquals("Test Company From Secrets", uploadConfig.companyName)
+        assertEquals("Test Department", uploadConfig.department)
+        assertEquals("Test Organization", uploadConfig.organization)
+        assertEquals("Test City", uploadConfig.city)
+        assertEquals("Test State", uploadConfig.state)
+        assertEquals("TS", uploadConfig.country)
+        assertEquals("RSA", uploadConfig.keyAlgorithm)
+        assertEquals(4096, uploadConfig.keySize)
+        assertEquals(30, uploadConfig.validity)
+        assertTrue(uploadConfig.overwriteExisting)
+    }
+
+    @Test
+    fun `task handles missing secrets file gracefully`() {
+        // Create SecretsConfig pointing to non-existent file
+        val secretsConfig = SecretsConfig(secretsEnvFile = File(tempDir, "nonexistent.env"))
+
+        // Apply configuration from secrets (should not throw)
+        assertDoesNotThrow {
+            KeystoreGenerationTask.createWithSecretsConfig(task, secretsConfig)
+        }
+
+        // Should use default configurations
+        val originalConfig = task.originalConfig.get()
+        val uploadConfig = task.uploadConfig.get()
+
+        assertEquals("Android Debug", originalConfig.companyName)
+        assertEquals("Android Release", uploadConfig.companyName)
+    }
+
+    @Test
+    fun `task configuration can be overridden programmatically`() {
+        // Create custom configurations
+        val customOriginalConfig = KeystoreConfig(
+            keystorePassword = "custom_original_pass",
+            keyAlias = "custom_original_alias",
+            keyPassword = "custom_original_key_pass",
+            companyName = "Custom Original Company",
+            keySize = 4096,
+            validity = 50
+        )
+
+        val customUploadConfig = KeystoreConfig(
+            keystorePassword = "custom_upload_pass",
+            keyAlias = "custom_upload_alias",
+            keyPassword = "custom_upload_key_pass",
+            companyName = "Custom Upload Company",
+            keySize = 4096,
+            validity = 50
+        )
+
+        // Apply custom configurations
+        task.originalConfig.set(customOriginalConfig)
+        task.uploadConfig.set(customUploadConfig)
+
+        // Verify configurations were applied
+        val appliedOriginalConfig = task.originalConfig.get()
+        val appliedUploadConfig = task.uploadConfig.get()
+
+        assertEquals("custom_original_pass", appliedOriginalConfig.keystorePassword)
+        assertEquals("custom_original_alias", appliedOriginalConfig.keyAlias)
+        assertEquals("Custom Original Company", appliedOriginalConfig.companyName)
+        assertEquals(4096, appliedOriginalConfig.keySize)
+        assertEquals(50, appliedOriginalConfig.validity)
+
+        assertEquals("custom_upload_pass", appliedUploadConfig.keystorePassword)
+        assertEquals("custom_upload_alias", appliedUploadConfig.keyAlias)
+        assertEquals("Custom Upload Company", appliedUploadConfig.companyName)
+        assertEquals(4096, appliedUploadConfig.keySize)
+        assertEquals(50, appliedUploadConfig.validity)
+    }
+
+    @Test
+    fun `individual keystore generation flags work correctly`() {
+        // Test generating only ORIGINAL keystore
+        task.generateOriginal.set(true)
+        task.generateUpload.set(false)
+
+        assertTrue(task.generateOriginal.get())
+        assertFalse(task.generateUpload.get())
+
+        // Test generating only UPLOAD keystore
+        task.generateOriginal.set(false)
+        task.generateUpload.set(true)
+
+        assertFalse(task.generateOriginal.get())
+        assertTrue(task.generateUpload.get())
+
+        // Test generating both keystores
+        task.generateOriginal.set(true)
+        task.generateUpload.set(true)
+
+        assertTrue(task.generateOriginal.get())
+        assertTrue(task.generateUpload.get())
+    }
+
+    @Test
+    fun `task validates keystore configurations`() {
+        // Test with valid configuration
+        val validConfig = KeystoreConfig(
+            keystorePassword = "validpassword",
+            keyAlias = "validalias",
+            keyPassword = "validkeypass",
+            keySize = 2048,
+            validity = 25,
+            country = "US"
+        )
+
+        val validationErrors = validConfig.validate()
+        assertTrue(validationErrors.isEmpty(), "Valid configuration should have no errors")
+
+        // Test with invalid configuration
+        val invalidConfig = KeystoreConfig(
+            keystorePassword = "", // Invalid: blank password
+            keyAlias = "", // Invalid: blank alias
+            keyPassword = "", // Invalid: blank key password
+            keySize = 512, // Invalid: too small key size
+            validity = -1, // Invalid: negative validity
+            country = "USA" // Invalid: country code too long
+        )
+
+        val invalidErrors = invalidConfig.validate()
+        assertFalse(invalidErrors.isEmpty(), "Invalid configuration should have errors")
+        assertTrue(invalidErrors.any { it.contains("password cannot be blank") })
+        assertTrue(invalidErrors.any { it.contains("alias cannot be blank") })
+        assertTrue(invalidErrors.any { it.contains("Key size must be at least 1024") })
+        assertTrue(invalidErrors.any { it.contains("Validity period must be positive") })
+        assertTrue(invalidErrors.any { it.contains("Country code must be exactly 2 characters") })
+    }
+
+    @Test
+    fun `distinguished name is formatted correctly`() {
+        val config = KeystoreConfig(
+            companyName = "Test Company",
+            department = "Engineering",
+            organization = "Test Org",
+            city = "San Francisco",
+            state = "California",
+            country = "US"
+        )
+
+        val expectedDN = "CN=Test Company, OU=Engineering, O=Test Org, L=San Francisco, ST=California, C=US"
+        assertEquals(expectedDN, config.distinguishedName)
+    }
+
+    @Test
+    fun `keystore file paths are constructed correctly`() {
+        val config = KeystoreConfig(
+            keystoreDir = File(tempDir, "test-keystores"),
+            originalKeystoreName = "debug.keystore",
+            uploadKeystoreName = "release.keystore"
+        )
+
+        val expectedOriginalPath = File(File(tempDir, "test-keystores"), "debug.keystore")
+        val expectedUploadPath = File(File(tempDir, "test-keystores"), "release.keystore")
+
+        assertEquals(expectedOriginalPath, config.originalKeystorePath)
+        assertEquals(expectedUploadPath, config.uploadKeystorePath)
+    }
+}
diff --git a/build-logic/convention/src/test/kotlin/org/convention/keystore/SecretsEnvParserTest.kt b/build-logic/convention/src/test/kotlin/org/convention/keystore/SecretsEnvParserTest.kt
new file mode 100644
index 000000000..bdc0d47c0
--- /dev/null
+++ b/build-logic/convention/src/test/kotlin/org/convention/keystore/SecretsEnvParserTest.kt
@@ -0,0 +1,389 @@
+package org.convention.keystore
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+
+/**
+ * Unit tests for SecretsEnvParser covering edge cases and various file formats
+ * Tests the parsing logic against the keystore-manager.sh script behavior
+ */
+class SecretsEnvParserTest {
+
+    private lateinit var parser: SecretsEnvParser
+    private lateinit var config: SecretsConfig
+
+    @TempDir
+    lateinit var tempDir: File
+
+    @BeforeEach
+    fun setup() {
+        config = SecretsConfig()
+        parser = SecretsEnvParser(config)
+    }
+
+    @Test
+    fun `should parse simple key-value pairs`() {
+        val testFile = createTestFile(
+            """
+            # Simple key-value pairs
+            KEY1=value1
+            KEY2=value2
+            KEY3="quoted value"
+            KEY4='single quoted'
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertEquals("value1", result.secrets["KEY1"])
+        assertEquals("value2", result.secrets["KEY2"])
+        assertEquals("quoted value", result.secrets["KEY3"])
+        assertEquals("single quoted", result.secrets["KEY4"])
+    }
+
+    @Test
+    fun `should parse multiline heredoc values`() {
+        val testFile = createTestFile(
+            """
+            # Multiline value test
+            MULTILINE_KEY<<EOF
+            line 1
+            line 2
+            line 3
+            EOF
+            
+            ANOTHER_KEY=simple_value
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertEquals("line 1\nline 2\nline 3", result.multilineSecrets["MULTILINE_KEY"])
+        assertEquals("simple_value", result.secrets["ANOTHER_KEY"])
+    }
+
+    @Test
+    fun `should handle different heredoc delimiters`() {
+        val testFile = createTestFile(
+            """
+            KEY1<<END
+            content 1
+            END
+            
+            KEY2<<DELIMITER
+            content 2
+            DELIMITER
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertEquals("content 1", result.multilineSecrets["KEY1"])
+        assertEquals("content 2", result.multilineSecrets["KEY2"])
+    }
+
+    @Test
+    fun `should handle empty multiline values`() {
+        val testFile = createTestFile(
+            """
+            EMPTY_MULTILINE<<EOF
+            EOF
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertEquals("", result.multilineSecrets["EMPTY_MULTILINE"])
+    }
+
+    @Test
+    fun `should handle quotes in various formats`() {
+        val testFile = createTestFile(
+            """
+            UNQUOTED=value
+            DOUBLE_QUOTED="value with spaces"
+            SINGLE_QUOTED='value with spaces'
+            MIXED_QUOTES="value with 'inner' quotes"
+            ESCAPED="value with \"escaped\" quotes"
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertEquals("value", result.secrets["UNQUOTED"])
+        assertEquals("value with spaces", result.secrets["DOUBLE_QUOTED"])
+        assertEquals("value with spaces", result.secrets["SINGLE_QUOTED"])
+        assertEquals("value with 'inner' quotes", result.secrets["MIXED_QUOTES"])
+        val value = "value with \"escaped\" quotes"
+        assertEquals(value, result.secrets["ESCAPED"])
+    }
+
+    @Test
+    fun `should preserve comments when configured`() {
+        val testFile = createTestFile(
+            """
+            # This is a comment
+            KEY1=value1
+            # Another comment
+            KEY2=value2
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertEquals(2, result.comments.size)
+        assertTrue(result.comments.contains("# This is a comment"))
+        assertTrue(result.comments.contains("# Another comment"))
+    }
+
+    @Test
+    fun `should handle malformed multiline blocks`() {
+        val testFile = createTestFile(
+            """
+            # Missing delimiter
+            BAD_KEY<<
+            some content
+            
+            # Unterminated block
+            UNTERMINATED<<EOF
+            content without end
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertFalse(result.isValid)
+        assertTrue(result.errors.any { it.contains("Empty delimiter") })
+        assertTrue(result.errors.any { it.contains("Unterminated multiline block") })
+    }
+
+    @Test
+    fun `should flag mismatched heredoc terminator`() {
+        val testFile = createTestFile(
+            """
+            MISMATCHED<<EOF
+            some content
+            END
+            """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertFalse(result.isValid)
+        // Should report unterminated block mentioning the expected delimiter
+        assertTrue(result.errors.any { it.contains("Unterminated multiline block") && it.contains("EOF") })
+    }
+
+    @Test
+    fun `should flag stray terminator without start`() {
+        val testFile = createTestFile(
+            """
+            # A terminator without a corresponding start
+            END
+            """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertFalse(result.isValid)
+        assertTrue(result.errors.any { it.contains("Unrecognized line format: END") })
+    }
+
+    @Test
+    fun `should handle empty and whitespace-only lines`() {
+        val testFile = createTestFile(
+            """
+            KEY1=value1
+            
+                
+            KEY2=value2
+                    
+            KEY3=value3
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertEquals(3, result.secrets.size)
+    }
+
+    @Test
+    fun `should handle special characters in values`() {
+        val testFile = createTestFile(
+            """
+            SPECIAL_CHARS="value with @#$%^&*()+={}[]|\\:;\"'<>,.?/~"
+            URL_VALUE="https://example.com/path?param=value&other=123"
+            BASE64_LIKE="SGVsbG8gV29ybGQ="
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertNotNull(result.secrets["SPECIAL_CHARS"])
+        assertNotNull(result.secrets["URL_VALUE"])
+        assertNotNull(result.secrets["BASE64_LIKE"])
+    }
+
+    @Test
+    fun `should handle real keystore file format`() {
+        val testFile = createTestFile(
+            """
+            # Keystore configuration
+            ORIGINAL_KEYSTORE_FILE_PASSWORD=password123
+            ORIGINAL_KEYSTORE_ALIAS=myalias
+            ORIGINAL_KEYSTORE_ALIAS_PASSWORD=aliaspass
+            
+            ORIGINAL_KEYSTORE_FILE<<EOF
+            MIILEAIBAzCCCroGCSqGSIb3DQEHAaCCCqsEggqnMIIKozCCBcoGCSqGSIb3DQEHAaCCBbsEggW3
+            MIIFszCCBa8GCyqGSIb3DQEMCgECoIIFQDCCBTwwZgYJKoZIhvcNAQUNMFkwOAYJKoZIhvcNAQUM
+            EOF
+            
+            UPLOAD_KEYSTORE_FILE_PASSWORD=password456
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertEquals("password123", result.secrets["ORIGINAL_KEYSTORE_FILE_PASSWORD"])
+        assertEquals("myalias", result.secrets["ORIGINAL_KEYSTORE_ALIAS"])
+        assertTrue(result.multilineSecrets["ORIGINAL_KEYSTORE_FILE"]?.contains("MIILEAIBAzCCCroGCSqGSIb3DQEH") == true)
+        assertEquals("password456", result.secrets["UPLOAD_KEYSTORE_FILE_PASSWORD"])
+    }
+
+    @Test
+    fun `should validate required keystore secrets`() {
+        val testFile = createTestFile(
+            """
+            # Missing some required secrets
+            ORIGINAL_KEYSTORE_FILE_PASSWORD=password
+            # Missing ORIGINAL_KEYSTORE_ALIAS
+            ORIGINAL_KEYSTORE_ALIAS_PASSWORD=aliaspass
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+        val validationErrors = parser.validateKeystoreSecrets(result)
+
+        assertTrue(result.isValid) // Parsing is valid
+        assertFalse(validationErrors.isEmpty()) // But validation fails
+        assertTrue(validationErrors.any { it.contains("ORIGINAL_KEYSTORE_ALIAS") })
+    }
+
+    @Test
+    fun `should handle values with equals signs`() {
+        val testFile = createTestFile(
+            """
+            URL_WITH_PARAMS="https://api.example.com/v1/auth?token=abc123&user=test"
+            EQUATION="x = y + z"
+            BASE64_VALUE="YWxnb3JpdGhtPVJTQSZrZXlzaXplPTIwNDg="
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        assertTrue(result.isValid)
+        assertTrue(result.secrets["URL_WITH_PARAMS"]?.contains("token=abc123&user=test") == true)
+        assertEquals("x = y + z", result.secrets["EQUATION"])
+        assertNotNull(result.secrets["BASE64_VALUE"])
+    }
+
+    @Test
+    fun `should format secrets table correctly`() {
+        val testFile = createTestFile(
+            """
+            SHORT_KEY=value
+            VERY_LONG_KEY_NAME_THAT_EXCEEDS_NORMAL_LENGTH=short
+            MULTILINE<<EOF
+            line1
+            line2
+            EOF
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+        val tableOutput = parser.formatSecretsTable(result)
+
+        assertTrue(tableOutput.contains("SHORT_KEY"))
+        assertTrue(tableOutput.contains("VERY_LONG_KEY_NAME_THAT_EXCEEDS_NORMAL_LENGTH"))
+        assertTrue(tableOutput.contains("[MULTILINE VALUE]"))
+        assertTrue(tableOutput.contains("═"))
+        assertTrue(tableOutput.contains("║"))
+    }
+
+    @Test
+    fun `should handle file not found gracefully`() {
+        val nonExistentFile = File(tempDir, "nonexistent.env")
+        val result = parser.parseFile(nonExistentFile)
+
+        assertFalse(result.isValid)
+        assertTrue(result.errors.any { it.contains("File not found") })
+        assertTrue(result.secrets.isEmpty())
+        assertTrue(result.multilineSecrets.isEmpty())
+    }
+
+    @Test
+    fun `should handle malformed key-value pairs`() {
+        val testFile = createTestFile(
+            """
+            VALID_KEY=valid_value
+            =value_without_key
+            key_without_value=
+            just_text_no_equals
+            =
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        // Should parse what it can and report errors for malformed lines
+        assertTrue(result.secrets.containsKey("VALID_KEY"))
+        assertTrue(result.secrets.containsKey("key_without_value"))
+        assertEquals("", result.secrets["key_without_value"])
+        assertFalse(result.isValid) // Should have errors for malformed lines
+    }
+
+    @Test
+    fun `should handle nested heredoc delimiters`() {
+        val testFile = createTestFile(
+            """
+            OUTER_KEY<<OUTER
+            Some content
+            INNER_KEY<<INNER
+            nested content
+            INNER
+            More outer content
+            OUTER
+        """.trimIndent(),
+        )
+
+        val result = parser.parseFile(testFile)
+
+        // The parser should handle this by treating everything between OUTER delimiters as content
+        assertTrue(result.isValid)
+        val content = result.multilineSecrets["OUTER_KEY"]
+        assertNotNull(content)
+        assertTrue(content?.contains("INNER_KEY<<INNER") == true)
+        assertTrue(content?.contains("nested content") == true)
+    }
+
+    private fun createTestFile(content: String): File {
+        val file = File(tempDir, "test-secrets.env")
+        file.writeText(content)
+        return file
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/test/kotlin/org/convention/keystore/SecretsEnvUpdateTaskTest.kt b/build-logic/convention/src/test/kotlin/org/convention/keystore/SecretsEnvUpdateTaskTest.kt
new file mode 100644
index 000000000..f8c4c9fca
--- /dev/null
+++ b/build-logic/convention/src/test/kotlin/org/convention/keystore/SecretsEnvUpdateTaskTest.kt
@@ -0,0 +1,450 @@
+package org.convention.keystore
+
+import org.gradle.internal.impldep.org.testng.Assert.assertEquals
+import org.gradle.internal.impldep.org.testng.Assert.assertTrue
+import org.gradle.testfixtures.ProjectBuilder
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.io.File
+import java.nio.file.Path
+import java.util.Base64
+
+/**
+ * Test class for SecretsEnvUpdateTask
+ * 
+ * Tests various update scenarios as required by KMPPT-57:
+ * - secrets.env file creation and updates
+ * - Base64 encoding functionality  
+ * - Multiline value formatting with heredoc
+ * - File merge logic for existing variables
+ * - Output format validation for GitHub CLI compatibility
+ */
+class SecretsEnvUpdateTaskTest {
+
+    @TempDir
+    lateinit var tempDir: Path
+
+    private lateinit var project: org.gradle.api.Project
+    private lateinit var task: SecretsEnvUpdateTask
+    private lateinit var secretsFile: File
+    private lateinit var originalKeystoreFile: File
+    private lateinit var uploadKeystoreFile: File
+
+    @BeforeEach
+    fun setup() {
+        project = ProjectBuilder.builder()
+            .withProjectDir(tempDir.toFile())
+            .build()
+
+        task = project.tasks.create("testUpdateSecretsEnv", SecretsEnvUpdateTask::class.java)
+        
+        secretsFile = tempDir.resolve("secrets.env").toFile()
+        originalKeystoreFile = tempDir.resolve("original.keystore").toFile()
+        uploadKeystoreFile = tempDir.resolve("upload.keystore").toFile()
+
+        // Configure task
+        task.secretsEnvFile.set(secretsFile)
+        task.originalKeystoreFile.set(originalKeystoreFile)
+        task.uploadKeystoreFile.set(uploadKeystoreFile)
+        task.secretsConfig.set(SecretsConfig())
+    }
+
+    @Test
+    fun `test creates new secrets file when none exists`() {
+        // Arrange
+        createTestKeystoreFiles()
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        assertTrue(secretsFile.exists(), "Secrets file should be created")
+        val content = secretsFile.readText()
+        
+        assertTrue(content.contains("# GitHub Secrets Environment File"), "Should contain header comment")
+        assertTrue(content.contains("ORIGINAL_KEYSTORE_FILE<<EOF"), "Should contain original keystore heredoc")
+        assertTrue(content.contains("UPLOAD_KEYSTORE_FILE<<EOF"), "Should contain upload keystore heredoc")
+        assertTrue(content.contains("EOF"), "Should contain EOF delimiters")
+    }
+
+    @Test
+    fun `test updates existing secrets file preserving variables`() {
+        // Arrange
+        createTestKeystoreFiles()
+        createExistingSecretsFile()
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        val content = secretsFile.readText()
+        
+        // Check that existing variables are preserved
+        assertTrue(content.contains("EXISTING_SIMPLE_VAR=existing_value"), "Should preserve existing simple variable")
+        assertTrue(content.contains("ANOTHER_VAR=\"value with spaces\""), "Should preserve quoted variable")
+        
+        // Check that keystore variables are updated
+        assertTrue(content.contains("ORIGINAL_KEYSTORE_FILE<<EOF"), "Should update original keystore")
+        assertTrue(content.contains("UPLOAD_KEYSTORE_FILE<<EOF"), "Should update upload keystore")
+    }
+
+    @Test
+    fun `test preserves comments when updating file`() {
+        // Arrange
+        createTestKeystoreFiles()
+        createSecretsFileWithComments()
+        task.preserveComments.set(true)
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        val content = secretsFile.readText()
+        assertTrue(content.contains("# This is a custom comment"), "Should preserve custom comments")
+        assertTrue(content.contains("# Another important comment"), "Should preserve multiple comments")
+    }
+
+    @Test
+    fun `test base64 encoding produces valid output`() {
+        // Arrange
+        createTestKeystoreFiles()
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        val content = secretsFile.readText()
+        
+        // Extract base64 content
+        val originalB64 = extractBase64Content(content, "ORIGINAL_KEYSTORE_FILE")
+        val uploadB64 = extractBase64Content(content, "UPLOAD_KEYSTORE_FILE")
+
+        // Verify base64 is valid
+        assertTrue(isValidBase64(originalB64), "Original keystore base64 should be valid")
+        assertTrue(isValidBase64(uploadB64), "Upload keystore base64 should be valid")
+
+        // Verify decoded content matches original
+        val originalDecoded = Base64.getDecoder().decode(originalB64.replace("\n", ""))
+        val uploadDecoded = Base64.getDecoder().decode(uploadB64.replace("\n", ""))
+
+        assertEquals(originalKeystoreFile.readBytes().toList(), originalDecoded.toList(), 
+            "Decoded original keystore should match original file")
+        assertEquals(uploadKeystoreFile.readBytes().toList(), uploadDecoded.toList(), 
+            "Decoded upload keystore should match original file")
+    }
+
+    @Test
+    fun `test heredoc formatting is correct`() {
+        // Arrange
+        createTestKeystoreFiles()
+        task.useHeredocFormat.set(true)
+        task.heredocDelimiter.set("EOF")
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        val content = secretsFile.readText()
+        val lines = content.lines()
+
+        // Find heredoc blocks
+        val originalStart = lines.indexOfFirst { it == "ORIGINAL_KEYSTORE_FILE<<EOF" }
+        val uploadStart = lines.indexOfFirst { it == "UPLOAD_KEYSTORE_FILE<<EOF" }
+        
+        // Find the corresponding EOF markers after each start
+        val originalEnd = if (originalStart >= 0) {
+            lines.drop(originalStart + 1).indexOfFirst { it == "EOF" }.let { 
+                if (it >= 0) it + originalStart + 1 else -1 
+            }
+        } else -1
+        
+        val uploadEnd = if (uploadStart >= 0) {
+            lines.drop(uploadStart + 1).indexOfFirst { it == "EOF" }.let { 
+                if (it >= 0) it + uploadStart + 1 else -1 
+            }
+        } else -1
+
+        assertTrue(originalStart >= 0, "Should find original keystore heredoc start")
+        assertTrue(originalEnd > originalStart, "Should find original keystore heredoc end")
+        assertTrue(uploadStart >= 0, "Should find upload keystore heredoc start")
+        assertTrue(uploadEnd > uploadStart, "Should find upload keystore heredoc end")
+
+        // Verify content between heredoc markers is base64
+        val originalB64Lines = lines.subList(originalStart + 1, originalEnd)
+        assertTrue(originalB64Lines.isNotEmpty(), "Should have base64 content in original heredoc")
+        assertTrue(originalB64Lines.all { isValidBase64Line(it) }, "All lines in original heredoc should be valid base64")
+    }
+
+    @Test
+    fun `test line length wrapping for base64 content`() {
+        // Arrange
+        createTestKeystoreFiles()
+        task.base64LineLength.set(50) // Shorter line length for testing
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        val content = secretsFile.readText()
+        val originalB64 = extractBase64Content(content, "ORIGINAL_KEYSTORE_FILE")
+        val lines = originalB64.split("\n")
+
+        // Verify line length wrapping
+        lines.forEach { line ->
+            assertTrue(line.length <= 50, "Base64 lines should not exceed configured length: '${line}' (length: ${line.length})")
+        }
+    }
+
+    @Test
+    fun `test creates backup when enabled`() {
+        // Arrange
+        createTestKeystoreFiles()
+        createExistingSecretsFile()
+        task.createBackup.set(true)
+        
+        // Configure backup directory to be in temp directory
+        val customSecretsConfig = SecretsConfig(
+            backupDir = tempDir.resolve("secrets-backup").toFile()
+        )
+        task.secretsConfig.set(customSecretsConfig)
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        val backupDir = tempDir.resolve("secrets-backup").toFile()
+        assertTrue(backupDir.exists(), "Backup directory should be created")
+        assertTrue(backupDir.listFiles()?.any { it.name.startsWith("secrets.env.backup") } == true, 
+            "Backup file should be created")
+    }
+
+    @Test
+    fun `test validates output format for GitHub CLI compatibility`() {
+        // Arrange
+        createTestKeystoreFiles()
+        task.validateOutput.set(true)
+
+        // Act & Assert (should not throw exception)
+        task.updateSecretsEnv()
+
+        // Verify file can be parsed successfully
+        val parser = SecretsEnvParser(task.secretsConfig.get())
+        val parseResult = parser.parseFile(secretsFile)
+        assertTrue(parseResult.isValid, "Generated file should be valid: ${parseResult.errors}")
+    }
+
+    @Test
+    fun `test handles missing keystore files gracefully`() {
+        // Arrange - don't create keystore files, just set non-existent paths
+        task.originalKeystoreFile.set(File(tempDir.toFile(), "nonexistent.keystore"))
+        task.uploadKeystoreFile.set(File(tempDir.toFile(), "alsoNonexistent.keystore"))
+
+        // Act & Assert (should not throw exception)
+        task.updateSecretsEnv()
+
+        // Verify file is still created with proper content
+        assertTrue(secretsFile.exists(), "Secrets file should still be created")
+        val content = secretsFile.readText()
+        assertTrue(content.contains("# GitHub Secrets Environment File"), "Should contain header")
+        
+        // Should not contain any keystore secrets since files don't exist
+        assertTrue(!content.contains("ORIGINAL_KEYSTORE_FILE<<EOF"), "Should not contain original keystore")
+        assertTrue(!content.contains("UPLOAD_KEYSTORE_FILE<<EOF"), "Should not contain upload keystore")
+    }
+
+    @Test
+    fun `test additional secrets are included`() {
+        // Arrange
+        createTestKeystoreFiles()
+        val additionalSecrets = mapOf(
+            "CUSTOM_SECRET" to "custom_value",
+            "ANOTHER_SECRET" to "another_value"
+        )
+        task.additionalSecrets.set(additionalSecrets)
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        val content = secretsFile.readText()
+        assertTrue(content.contains("CUSTOM_SECRET=custom_value"), "Should include custom secret")
+        assertTrue(content.contains("ANOTHER_SECRET=another_value"), "Should include another secret")
+    }
+
+    @Test
+    fun `test multiline values use proper escaping when heredoc disabled`() {
+        // Arrange
+        createTestKeystoreFiles()
+        task.useHeredocFormat.set(false)
+        task.heredocDelimiter.set("EOF")
+        
+        // Verify the property is set correctly before execution
+        assertEquals(false, task.useHeredocFormat.get(), "useHeredocFormat should be false")
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert
+        val content = secretsFile.readText()
+        
+        // Check for the specific patterns we expect when heredoc is disabled
+        val hasOriginalHeredoc = content.contains("ORIGINAL_KEYSTORE_FILE<<EOF")
+        val hasUploadHeredoc = content.contains("UPLOAD_KEYSTORE_FILE<<EOF")
+        val hasOriginalQuoted = content.contains("ORIGINAL_KEYSTORE_FILE=\"")
+        val hasUploadQuoted = content.contains("UPLOAD_KEYSTORE_FILE=\"")
+        
+        // Debug output if test fails
+        if (hasOriginalHeredoc || hasUploadHeredoc || !hasOriginalQuoted || !hasUploadQuoted) {
+            println("=== DEBUG: Unexpected content format ===")
+            println("Has original heredoc: $hasOriginalHeredoc (should be false)")
+            println("Has upload heredoc: $hasUploadHeredoc (should be false)")
+            println("Has original quoted: $hasOriginalQuoted (should be true)")
+            println("Has upload quoted: $hasUploadQuoted (should be true)")
+            println("Content:")
+            println(content)
+            println("=== END DEBUG ===")
+        }
+        
+        // Main assertions
+        assertTrue(!hasOriginalHeredoc, "Should not contain original keystore heredoc start")
+        assertTrue(!hasUploadHeredoc, "Should not contain upload keystore heredoc start")
+        assertTrue(hasOriginalQuoted, "Should use quoted format for original keystore")
+        assertTrue(hasUploadQuoted, "Should use quoted format for upload keystore")
+    }
+
+    @Test
+    fun `test handles large keystore files appropriately`() {
+        // Arrange - create a larger test file
+        val largeContent = "large keystore content ".repeat(1000)
+        originalKeystoreFile.writeBytes(largeContent.toByteArray())
+        uploadKeystoreFile.writeBytes("smaller content".toByteArray())
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert - should still work but log warnings for large files
+        assertTrue(secretsFile.exists(), "Secrets file should be created")
+        val content = secretsFile.readText()
+        assertTrue(content.contains("ORIGINAL_KEYSTORE_FILE<<EOF"), "Should contain original keystore")
+        assertTrue(content.contains("UPLOAD_KEYSTORE_FILE<<EOF"), "Should contain upload keystore")
+    }
+
+    @Test
+    fun `test validation detects GitHub CLI compatibility issues`() {
+        // Arrange
+        createTestKeystoreFiles()
+        val problematicSecrets = mapOf(
+            "secret-with-dash" to "value1",
+            "secret with space" to "value2",
+            "lowercaseSecret" to "value3"
+        )
+        task.additionalSecrets.set(problematicSecrets)
+        task.validateOutput.set(true)
+
+        // Act & Assert - should complete but log warnings
+        task.updateSecretsEnv()
+        
+        // Verify file contains the problematic secrets
+        val content = secretsFile.readText()
+        assertTrue(content.contains("secret-with-dash=value1"), "Should include dash secret")
+        assertTrue(content.contains("secret with space"), "Should include space secret")
+        assertTrue(content.contains("lowercaseSecret=value3"), "Should include lowercase secret")
+    }
+
+    @Test
+    fun `test empty keystore files are handled gracefully`() {
+        // Arrange - create empty keystore files
+        originalKeystoreFile.writeBytes(byteArrayOf())
+        uploadKeystoreFile.writeBytes(byteArrayOf())
+
+        // Act
+        task.updateSecretsEnv()
+
+        // Assert - should create file but log warnings about empty files
+        assertTrue(secretsFile.exists(), "Secrets file should be created")
+        val content = secretsFile.readText()
+        assertTrue(content.contains("# GitHub Secrets Environment File"), "Should contain header")
+        
+        // Empty files should not produce keystore secrets
+        assertTrue(!content.contains("ORIGINAL_KEYSTORE_FILE<<EOF"), "Should not contain original keystore")
+        assertTrue(!content.contains("UPLOAD_KEYSTORE_FILE<<EOF"), "Should not contain upload keystore")
+    }
+
+    // Helper methods
+
+    private fun createTestKeystoreFiles() {
+        // Create dummy keystore files with some content
+        originalKeystoreFile.writeBytes("dummy original keystore content".toByteArray())
+        uploadKeystoreFile.writeBytes("dummy upload keystore content for testing".toByteArray())
+    }
+
+    private fun createExistingSecretsFile() {
+        secretsFile.writeText("""
+            # Existing secrets file
+            EXISTING_SIMPLE_VAR=existing_value
+            ANOTHER_VAR="value with spaces"
+            
+            ORIGINAL_KEYSTORE_FILE<<EOF
+            old_base64_content_here
+            EOF
+            
+            UPLOAD_KEYSTORE_FILE<<EOF
+            old_upload_content_here
+            EOF
+        """.trimIndent())
+    }
+
+    private fun createSecretsFileWithComments() {
+        secretsFile.writeText("""
+            # This is a custom comment
+            EXISTING_VAR=value
+            # Another important comment
+            
+            ORIGINAL_KEYSTORE_FILE<<EOF
+            old_content
+            EOF
+        """.trimIndent())
+    }
+
+    private fun extractBase64Content(content: String, key: String): String {
+        val lines = content.lines()
+        val startIndex = lines.indexOfFirst { it == "$key<<EOF" }
+        
+        if (startIndex >= 0) {
+            val endIndex = lines.drop(startIndex + 1).indexOfFirst { it == "EOF" }.let { 
+                if (it >= 0) it + startIndex + 1 else -1 
+            }
+            
+            if (endIndex > startIndex) {
+                return lines.subList(startIndex + 1, endIndex).joinToString("\n")
+            }
+        }
+        return ""
+    }
+
+    private fun isValidBase64(content: String): Boolean {
+        return try {
+            Base64.getDecoder().decode(content.replace("\n", ""))
+            true
+        } catch (e: IllegalArgumentException) {
+            false
+        }
+    }
+
+    private fun isValidBase64Line(line: String): Boolean {
+        return line.matches(Regex("[A-Za-z0-9+/=]*"))
+    }
+
+    @Test
+    fun `test task property configuration works correctly`() {
+        // Test that we can set and read task properties correctly
+        task.useHeredocFormat.set(false)
+        task.heredocDelimiter.set("CUSTOM_EOF")
+        task.base64LineLength.set(64)
+        
+        assertEquals(false, task.useHeredocFormat.get(), "Should be able to set useHeredocFormat to false")
+        assertEquals("CUSTOM_EOF", task.heredocDelimiter.get(), "Should be able to set custom delimiter")
+        assertEquals(64, task.base64LineLength.get(), "Should be able to set custom line length")
+    }
+}
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
index f96491411..875164f78 100644
--- a/build-logic/settings.gradle.kts
+++ b/build-logic/settings.gradle.kts
@@ -1,19 +1,3 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 dependencyResolutionManagement {
     repositories {
         google()
diff --git a/ci-prepush.bat b/ci-prepush.bat
index 863930a86..337cb8b2d 100644
--- a/ci-prepush.bat
+++ b/ci-prepush.bat
@@ -13,8 +13,8 @@ call :run_gradle_task "check -p build-logic"
 call :run_gradle_task "spotlessApply --no-configuration-cache"
 call :run_gradle_task "dependencyGuardBaseline"
 call :run_gradle_task "detekt"
-call :run_gradle_task ":cmp-android:build"
-call :run_gradle_task ":cmp-android:updateProdReleaseBadging"
+call :run_gradle_task ":mifos-android:build"
+call :run_gradle_task ":mifos-android:updateProdReleaseBadging"
 
 echo All checks and tests completed successfully.
 exit /b 0
diff --git a/ci-prepush.sh b/ci-prepush.sh
old mode 100755
new mode 100644
index ada49c947..14d83940f
--- a/ci-prepush.sh
+++ b/ci-prepush.sh
@@ -28,6 +28,8 @@ tasks=(
     "spotlessApply --no-configuration-cache"
     "dependencyGuardBaseline"
     "detekt"
+    ":cmp-android:build"
+    ":cmp-android:updateProdReleaseBadging"
 )
 
 for task in "${tasks[@]}"; do
diff --git a/cmp-android/build.gradle.kts b/cmp-android/build.gradle.kts
index 73000be6e..eed1f90d7 100644
--- a/cmp-android/build.gradle.kts
+++ b/cmp-android/build.gradle.kts
@@ -5,17 +5,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
-import org.mifos.mobile.MifosBuildType
-import org.mifos.mobile.dynamicVersion
+import com.android.build.api.instrumentation.InstrumentationScope
+import org.convention.AppBuildType
+import org.convention.dynamicVersion
 
 plugins {
-    alias(libs.plugins.mifos.android.application)
-    alias(libs.plugins.mifos.android.application.compose)
-    alias(libs.plugins.mifos.android.application.flavors)
-    id("com.google.android.gms.oss-licenses-plugin")
-    id("com.google.devtools.ksp")
+    alias(libs.plugins.android.application.convention)
+    alias(libs.plugins.android.application.compose.convention)
+    alias(libs.plugins.android.application.flavors.convention)
+    alias(libs.plugins.baselineprofile)
+    alias(libs.plugins.roborazzi)
+    alias(libs.plugins.aboutLibraries)
+    alias(libs.plugins.ksp)
 }
 
 val packageNameSpace: String = libs.versions.androidPackageNamespace.get()
@@ -33,11 +36,10 @@ android {
 
     signingConfigs {
         create("release") {
-            storeFile =
-                file(System.getenv("KEYSTORE_PATH") ?: "../keystores/release_keystore.keystore")
-            storePassword = System.getenv("KEYSTORE_PASSWORD") ?: "mifos1234"
-            keyAlias = System.getenv("KEYSTORE_ALIAS") ?: "mifos-mobile"
-            keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD") ?: "mifos1234"
+            storeFile = file(System.getenv("KEYSTORE_PATH") ?: "../keystores/release_keystore.keystore")
+            storePassword = System.getenv("KEYSTORE_PASSWORD") ?: "Wizard@123"
+            keyAlias = System.getenv("KEYSTORE_ALIAS") ?: "kmp-project-template"
+            keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD") ?: "Wizard@123"
             enableV1Signing = true
             enableV2Signing = true
         }
@@ -45,22 +47,17 @@ android {
 
     buildTypes {
         debug {
-            applicationIdSuffix = MifosBuildType.DEBUG.applicationIdSuffix
+            applicationIdSuffix = AppBuildType.DEBUG.applicationIdSuffix
         }
 
-        // Disabling proguard for now until
-        // https://github.com/openMF/mobile-wallet/issues/1815 this issue is resolved
         release {
-            isMinifyEnabled = false
-            applicationIdSuffix = MifosBuildType.RELEASE.applicationIdSuffix
-            isShrinkResources = false
+            isMinifyEnabled = true
+            applicationIdSuffix = AppBuildType.RELEASE.applicationIdSuffix
+            isShrinkResources = true
             isDebuggable = false
             isJniDebuggable = false
             signingConfig = signingConfigs.getByName("release")
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro",
-            )
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
 
@@ -81,31 +78,32 @@ android {
         }
     }
 
-    lint {
-        xmlReport = true
-        checkDependencies = true
-        abortOnError = false
-        // Disable this rule until we ship the libraries to some maven.
-        disable += "ResourceName"
-        disable += "MissingTranslation"
-        disable += "ExtraTranslation"
-        baseline = File("lint-baseline.xml")
-        explainIssues = true
-        htmlReport = true
+    // TODO:: Workaround for Ktor(3.2.0) R8/ProGuard Issue
+    androidComponents {
+        onVariants { variant ->
+            variant.instrumentation.transformClassesWith(
+                FieldSkippingClassVisitor.Factory::class.java,
+                scope = InstrumentationScope.ALL,
+            ) { params ->
+                params.classes.add("io.ktor.client.plugins.Messages")
+            }
+        }
     }
 }
-dependencyGuard {
-    configuration("demoDebugRuntimeClasspath")
-    configuration("demoReleaseRuntimeClasspath")
-    configuration("prodDebugRuntimeClasspath")
-    configuration("prodReleaseRuntimeClasspath")
-}
 
 dependencies {
     implementation(projects.cmpShared)
+    implementation(projects.core.ui)
+    implementation(projects.coreBase.platform)
+    implementation(projects.coreBase.ui)
+    implementation(projects.coreBase.analytics)
 
     implementation(projects.core.ui)
+    implementation(projects.core.model)
+    implementation(projects.core.data)
+    implementation(projects.core.datastore)
 
+    implementation(projects.coreBase.ui)
     implementation(projects.coreBase.platform)
 
     // Compose
@@ -123,6 +121,18 @@ dependencies {
     implementation(libs.koin.compose)
     implementation(libs.koin.compose.viewmodel)
 
+    implementation(libs.kermit.koin)
+
+    implementation(libs.app.update.ktx)
+    implementation(libs.app.update)
+
+    implementation(libs.coil.kt)
+
+    implementation(libs.filekit.core)
+    implementation(libs.filekit.compose)
+    implementation(libs.filekit.dialog.compose)
+    implementation(libs.filekit.coil)
+
     runtimeOnly(libs.androidx.compose.runtime)
     debugImplementation(libs.androidx.compose.ui.tooling)
 
@@ -132,12 +142,6 @@ dependencies {
     androidTestImplementation(libs.androidx.compose.ui.test)
     androidTestImplementation(libs.androidx.test.ext.junit)
 
-    implementation(libs.filekit.core)
-    implementation(libs.filekit.compose)
-    implementation(libs.filekit.dialog.compose)
-
-    testImplementation(kotlin("test"))
-    testImplementation(libs.koin.test)
     testImplementation(libs.koin.test.junit4)
 }
 
@@ -146,4 +150,13 @@ dependencyGuard {
         modules = true
         tree = true
     }
+}
+
+baselineProfile {
+    // Don't build on every iteration of a full assemble.
+    // Instead enable generation directly for the release build variant.
+    automaticGenerationDuringBuild = false
+
+    // Make use of Dex Layout Optimizations via Startup Profiles
+    dexLayoutOptimization = true
 }
\ No newline at end of file
diff --git a/cmp-android/lint-baseline.xml b/cmp-android/lint-baseline.xml
index 729cb6985..87e86fbf4 100644
--- a/cmp-android/lint-baseline.xml
+++ b/cmp-android/lint-baseline.xml
@@ -6,7 +6,7 @@
     If a copy of the MPL was not distributed with this file,
     You can obtain one at https://mozilla.org/MPL/2.0/.
 
-    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+    See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
 -->
 <issues format="6" by="lint 8.5.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.5.2)" variant="all" version="8.5.2">
 
diff --git a/cmp-android/prodRelease-badging.txt b/cmp-android/prodRelease-badging.txt
index 0314444d1..c3c948380 100644
--- a/cmp-android/prodRelease-badging.txt
+++ b/cmp-android/prodRelease-badging.txt
@@ -1,123 +1,115 @@
-package: name='org.mifos.mobile' versionCode='1' versionName='2024.12.4-beta.0.4' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
-sdkVersion:'26'
-targetSdkVersion:'34'
+package: name='cmp.android.app' versionCode='1' versionName='2025.7.3-beta.0.0' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
+minSdkVersion:'26'
+targetSdkVersion:'36'
 uses-permission: name='android.permission.INTERNET'
-uses-permission: name='android.permission.CAMERA'
-uses-permission: name='android.permission.READ_EXTERNAL_STORAGE' maxSdkVersion='32'
-uses-permission: name='android.permission.WRITE_EXTERNAL_STORAGE' maxSdkVersion='32'
-uses-permission: name='android.permission.VIBRATE'
-uses-permission: name='android.permission.FLASHLIGHT'
+uses-permission: name='android.permission.POST_NOTIFICATIONS'
 uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
 uses-permission: name='android.permission.WAKE_LOCK'
 uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE'
 uses-permission: name='android.permission.ACCESS_ADSERVICES_ATTRIBUTION'
 uses-permission: name='android.permission.ACCESS_ADSERVICES_AD_ID'
-uses-permission: name='org.mifos.mobile.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
-application-label:'Mifos Mobile'
-application-label-af:'Mifos Mobile'
-application-label-am:'Mifos Mobile'
-application-label-ar:'Mifos Mobile'
-application-label-as:'Mifos Mobile'
-application-label-az:'Mifos Mobile'
-application-label-be:'Mifos Mobile'
-application-label-bg:'Mifos Mobile'
-application-label-bn:'Mifos Mobile'
-application-label-bs:'Mifos Mobile'
-application-label-ca:'Mifos Mobile'
-application-label-cs:'Mifos Mobile'
-application-label-da:'Mifos Mobile'
-application-label-de:'Mifos Mobile'
-application-label-el:'Mifos Mobile'
-application-label-en-AU:'Mifos Mobile'
-application-label-en-CA:'Mifos Mobile'
-application-label-en-GB:'Mifos Mobile'
-application-label-en-IN:'Mifos Mobile'
-application-label-en-XC:'Mifos Mobile'
-application-label-es:'Mifos Mobile'
-application-label-es-US:'Mifos Mobile'
-application-label-et:'Mifos Mobile'
-application-label-eu:'Mifos Mobile'
-application-label-fa:'Mifos Mobile'
-application-label-fi:'Mifos Mobile'
-application-label-fr:'Mifos Mobile'
-application-label-fr-CA:'Mifos Mobile'
-application-label-gl:'Mifos Mobile'
-application-label-gu:'Mifos Mobile'
-application-label-hi:'Mifos Mobile'
-application-label-hr:'Mifos Mobile'
-application-label-hu:'Mifos Mobile'
-application-label-hy:'Mifos Mobile'
-application-label-in:'Mifos Mobile'
-application-label-is:'Mifos Mobile'
-application-label-it:'Mifos Mobile'
-application-label-iw:'Mifos Mobile'
-application-label-ja:'Mifos Mobile'
-application-label-ka:'Mifos Mobile'
-application-label-kk:'Mifos Mobile'
-application-label-km:'Mifos Mobile'
-application-label-kn:'Mifos Mobile'
-application-label-ko:'Mifos Mobile'
-application-label-ky:'Mifos Mobile'
-application-label-lo:'Mifos Mobile'
-application-label-lt:'Mifos Mobile'
-application-label-lv:'Mifos Mobile'
-application-label-mk:'Mifos Mobile'
-application-label-ml:'Mifos Mobile'
-application-label-mn:'Mifos Mobile'
-application-label-mr:'Mifos Mobile'
-application-label-ms:'Mifos Mobile'
-application-label-my:'Mifos Mobile'
-application-label-nb:'Mifos Mobile'
-application-label-ne:'Mifos Mobile'
-application-label-nl:'Mifos Mobile'
-application-label-or:'Mifos Mobile'
-application-label-pa:'Mifos Mobile'
-application-label-pl:'Mifos Mobile'
-application-label-pt:'Mifos Mobile'
-application-label-pt-BR:'Mifos Mobile'
-application-label-pt-PT:'Mifos Mobile'
-application-label-ro:'Mifos Mobile'
-application-label-ru:'Mifos Mobile'
-application-label-si:'Mifos Mobile'
-application-label-sk:'Mifos Mobile'
-application-label-sl:'Mifos Mobile'
-application-label-sq:'Mifos Mobile'
-application-label-sr:'Mifos Mobile'
-application-label-sr-Latn:'Mifos Mobile'
-application-label-sv:'Mifos Mobile'
-application-label-sw:'Mifos Mobile'
-application-label-ta:'Mifos Mobile'
-application-label-te:'Mifos Mobile'
-application-label-th:'Mifos Mobile'
-application-label-tl:'Mifos Mobile'
-application-label-tr:'Mifos Mobile'
-application-label-uk:'Mifos Mobile'
-application-label-ur:'Mifos Mobile'
-application-label-uz:'Mifos Mobile'
-application-label-vi:'Mifos Mobile'
-application-label-zh-CN:'Mifos Mobile'
-application-label-zh-HK:'Mifos Mobile'
-application-label-zh-TW:'Mifos Mobile'
-application-label-zu:'Mifos Mobile'
+uses-permission: name='cmp.android.app.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
+application-label:'AndroidApp'
+application-label-af:'AndroidApp'
+application-label-am:'AndroidApp'
+application-label-ar:'AndroidApp'
+application-label-as:'AndroidApp'
+application-label-az:'AndroidApp'
+application-label-be:'AndroidApp'
+application-label-bg:'AndroidApp'
+application-label-bn:'AndroidApp'
+application-label-bs:'AndroidApp'
+application-label-ca:'AndroidApp'
+application-label-cs:'AndroidApp'
+application-label-da:'AndroidApp'
+application-label-de:'AndroidApp'
+application-label-el:'AndroidApp'
+application-label-en-AU:'AndroidApp'
+application-label-en-CA:'AndroidApp'
+application-label-en-GB:'AndroidApp'
+application-label-en-IN:'AndroidApp'
+application-label-en-XC:'AndroidApp'
+application-label-es:'AndroidApp'
+application-label-es-US:'AndroidApp'
+application-label-et:'AndroidApp'
+application-label-eu:'AndroidApp'
+application-label-fa:'AndroidApp'
+application-label-fi:'AndroidApp'
+application-label-fr:'AndroidApp'
+application-label-fr-CA:'AndroidApp'
+application-label-gl:'AndroidApp'
+application-label-gu:'AndroidApp'
+application-label-hi:'AndroidApp'
+application-label-hr:'AndroidApp'
+application-label-hu:'AndroidApp'
+application-label-hy:'AndroidApp'
+application-label-in:'AndroidApp'
+application-label-is:'AndroidApp'
+application-label-it:'AndroidApp'
+application-label-iw:'AndroidApp'
+application-label-ja:'AndroidApp'
+application-label-ka:'AndroidApp'
+application-label-kk:'AndroidApp'
+application-label-km:'AndroidApp'
+application-label-kn:'AndroidApp'
+application-label-ko:'AndroidApp'
+application-label-ky:'AndroidApp'
+application-label-lo:'AndroidApp'
+application-label-lt:'AndroidApp'
+application-label-lv:'AndroidApp'
+application-label-mk:'AndroidApp'
+application-label-ml:'AndroidApp'
+application-label-mn:'AndroidApp'
+application-label-mr:'AndroidApp'
+application-label-ms:'AndroidApp'
+application-label-my:'AndroidApp'
+application-label-nb:'AndroidApp'
+application-label-ne:'AndroidApp'
+application-label-nl:'AndroidApp'
+application-label-or:'AndroidApp'
+application-label-pa:'AndroidApp'
+application-label-pl:'AndroidApp'
+application-label-pt:'AndroidApp'
+application-label-pt-BR:'AndroidApp'
+application-label-pt-PT:'AndroidApp'
+application-label-ro:'AndroidApp'
+application-label-ru:'AndroidApp'
+application-label-si:'AndroidApp'
+application-label-sk:'AndroidApp'
+application-label-sl:'AndroidApp'
+application-label-sq:'AndroidApp'
+application-label-sr:'AndroidApp'
+application-label-sr-Latn:'AndroidApp'
+application-label-sv:'AndroidApp'
+application-label-sw:'AndroidApp'
+application-label-ta:'AndroidApp'
+application-label-te:'AndroidApp'
+application-label-th:'AndroidApp'
+application-label-tl:'AndroidApp'
+application-label-tr:'AndroidApp'
+application-label-uk:'AndroidApp'
+application-label-ur:'AndroidApp'
+application-label-uz:'AndroidApp'
+application-label-vi:'AndroidApp'
+application-label-zh-CN:'AndroidApp'
+application-label-zh-HK:'AndroidApp'
+application-label-zh-TW:'AndroidApp'
+application-label-zu:'AndroidApp'
 application-icon-160:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-240:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-320:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-480:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml'
-application: label='Mifos Mobile' icon='res/mipmap-anydpi-v26/ic_launcher.xml'
-launchable-activity: name='org.mifospay.MainActivity'  label='' icon=''
-property: name='android.adservices.AD_SERVICES_CONFIG' resource='res/xml/ga_ad_services_config.xml' 
+application: label='AndroidApp' icon='res/mipmap-anydpi-v26/ic_launcher.xml'
+launchable-activity: name='cmp.android.app.MainActivity'  label='' icon=''
 uses-library-not-required:'androidx.window.extensions'
 uses-library-not-required:'androidx.window.sidecar'
 uses-library-not-required:'android.ext.adservices'
 feature-group: label=''
-  uses-feature: name='android.hardware.camera'
-  uses-feature: name='android.hardware.camera.autofocus'
+  uses-feature-not-required: name='android.hardware.camera'
   uses-feature: name='android.hardware.faketouch'
   uses-implied-feature: name='android.hardware.faketouch' reason='default feature for all apps'
-  uses-feature: name='android.hardware.screen.portrait'
-  uses-implied-feature: name='android.hardware.screen.portrait' reason='one or more activities have specified a portrait orientation'
 main
 other-activities
 other-receivers
diff --git a/cmp-android/proguard-rules.pro b/cmp-android/proguard-rules.pro
index fe8b865e0..962d929df 100644
--- a/cmp-android/proguard-rules.pro
+++ b/cmp-android/proguard-rules.pro
@@ -6,6 +6,9 @@
 -keep class com.yalantis.ucrop** { *; }
 -keep interface com.yalantis.ucrop** { *; }
 
+-keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
+-keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+
 # Proguard Kotlin Example https://github.com/Guardsquare/proguard/blob/master/examples/application-kotlin/proguard.pro
 
 -keepattributes *Annotation*
@@ -129,7 +132,6 @@
 -dontwarn io.ktor.client.network.sockets.SocketTimeoutException
 -dontwarn java.lang.management.RuntimeMXBean
 
--keep class org.mifospay.core.network.services.* { *;}
 -keep class de.jensklingenberg.ktorfit.converter.** { *; }
 -keep class de.jensklingenberg.ktorfit.** { *; }
 -keeppackagenames de.jensklingenberg.ktorfit.*
\ No newline at end of file
diff --git a/cmp-android/src/main/AndroidManifest.xml b/cmp-android/src/main/AndroidManifest.xml
index da6c973cb..714717c8e 100644
--- a/cmp-android/src/main/AndroidManifest.xml
+++ b/cmp-android/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     If a copy of the MPL was not distributed with this file,
     You can obtain one at https://mozilla.org/MPL/2.0/.
 
-    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+    See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
@@ -16,13 +16,7 @@
         android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"
-        tools:ignore="ScopedStorage" />
+
     <!--
     Firebase automatically adds the AD_ID permission, even though we don't use it. If you use this
     permission you must declare how you're using it to Google Play, otherwise the app will be
@@ -39,12 +33,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.MifosSplash">
+        android:theme="@style/Theme.AppSplash">
 
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.MifosSplash"
+            android:theme="@style/Theme.AppSplash"
             android:windowSoftInputMode="adjustPan|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -53,21 +47,9 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/Theme.AppCompat.DayNight"
-            android:windowSoftInputMode="adjustResize" />
-        <activity
-            android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/Theme.AppCompat.DayNight"
-            android:windowSoftInputMode="adjustResize" />
-
-
         <meta-data
             android:name="com.google.mlkit.vision.DEPENDENCIES"
-            android:value="barcode" />
+            android:value="barcode_ui" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -76,30 +58,22 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/fileproviderpath" />
+                android:resource="@xml/provider_paths" />
         </provider>
 
-        <!-- Prompt Google Play services to install the backported photo picker module -->
-        <service android:name="com.google.android.gms.metadata.ModuleDependencies" android:enabled="false" android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
-            </intent-filter>
-
-            <meta-data android:name="photopicker_activity:0:required" android:value="" />
-        </service>
-
-        <!-- Disable Firebase analytics by default. This setting is overwritten for the `prod` flavor -->
-        <meta-data
-            android:name="firebase_analytics_collection_deactivated"
-            android:value="true" />
         <!-- Disable collection of AD_ID for all build variants -->
         <meta-data
             android:name="google_analytics_adid_collection_enabled"
             android:value="false" />
-        <!-- Firebase automatically adds the following property which we don't use so remove it -->
-        <property
-            android:name="android.adservices.AD_SERVICES_CONFIG"
-            tools:node="remove" />
+
+        <!-- Enable Firebase analytics for `prod` builds -->
+        <meta-data
+            android:name="firebase_analytics_collection_deactivated"
+            android:value="true" />
+
+        <meta-data
+            android:name="firebase_crashlytics_collection_enabled"
+            android:value="false" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/cmp-android/src/main/kotlin/cmp/android/app/AndroidApp.kt b/cmp-android/src/main/kotlin/cmp/android/app/AndroidApp.kt
index cbbff9b09..bb5b40bea 100644
--- a/cmp-android/src/main/kotlin/cmp/android/app/AndroidApp.kt
+++ b/cmp-android/src/main/kotlin/cmp/android/app/AndroidApp.kt
@@ -5,15 +5,21 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package cmp.android.app
 
 import android.app.Application
 import cmp.shared.utils.initKoin
+import coil3.ImageLoader
+import coil3.PlatformContext
+import coil3.SingletonImageLoader
+import coil3.disk.DiskCache
+import coil3.disk.directory
+import coil3.request.CachePolicy
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
-import org.koin.core.logger.Level
+import template.core.base.ui.getDefaultImageLoader
 
 /**
  * Android application class.
@@ -23,12 +29,24 @@ import org.koin.core.logger.Level
  * @constructor Create empty Android app
  * @see Application
  */
-class AndroidApp : Application() {
+class AndroidApp : Application(), SingletonImageLoader.Factory {
     override fun onCreate() {
         super.onCreate()
         initKoin {
-            androidContext(this@AndroidApp) // Provides the Android app context
-            androidLogger(Level.DEBUG) // Enables Koin's logging for debugging
+            androidContext(this@AndroidApp)
+            androidLogger()
         }
     }
+
+    override fun newImageLoader(context: PlatformContext): ImageLoader =
+        getDefaultImageLoader(context)
+            .newBuilder()
+            .diskCachePolicy(CachePolicy.ENABLED)
+            .diskCache {
+                DiskCache.Builder()
+                    .directory(context.cacheDir.resolve("image_cache"))
+                    .maxSizePercent(0.25)
+                    .build()
+            }
+            .build()
 }
diff --git a/cmp-android/src/main/kotlin/cmp/android/app/AppThemeExtensions.kt b/cmp-android/src/main/kotlin/cmp/android/app/AppThemeExtensions.kt
new file mode 100644
index 000000000..0068bf6df
--- /dev/null
+++ b/cmp-android/src/main/kotlin/cmp/android/app/AppThemeExtensions.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package cmp.android.app
+
+import org.mifos.core.model.DarkThemeConfig
+
+fun DarkThemeConfig.isDarkMode(
+    isSystemDarkMode: Boolean,
+): Boolean =
+    when (this) {
+        DarkThemeConfig.FOLLOW_SYSTEM -> isSystemDarkMode
+        DarkThemeConfig.DARK -> true
+        DarkThemeConfig.LIGHT -> false
+    }
diff --git a/cmp-android/src/main/kotlin/cmp/android/app/BuildConfigUtils.kt b/cmp-android/src/main/kotlin/cmp/android/app/BuildConfigUtils.kt
new file mode 100644
index 000000000..a96b9151c
--- /dev/null
+++ b/cmp-android/src/main/kotlin/cmp/android/app/BuildConfigUtils.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package cmp.android.app
+
+import android.os.Build
+
+/**
+ * A boolean property that indicates whether the current build is a dev build.
+ */
+val isDevBuild: Boolean
+    get() = BuildConfig.BUILD_TYPE == "debug"
+
+/**
+ * A string that represents a displayable app version.
+ */
+val versionData: String
+    get() = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
+
+/**
+ * A string that represents device data.
+ */
+val deviceData: String get() = "$deviceBrandModel $osInfo $buildInfo"
+
+/**
+ * A string representing the build flavor or blank if it is the standard configuration.
+ */
+private val buildFlavorName: String
+    get() = when (BuildConfig.FLAVOR) {
+        "demo" -> ""
+        else -> "-${BuildConfig.FLAVOR}"
+    }
+
+/**
+ * A string representing the build type.
+ */
+private val buildTypeName: String
+    get() = when (BuildConfig.BUILD_TYPE) {
+        "debug" -> "dev"
+        "release" -> "prod"
+        else -> BuildConfig.BUILD_TYPE
+    }
+
+/**
+ * A string representing the device brand and model.
+ */
+private val deviceBrandModel: String get() = "\uD83D\uDCF1 ${Build.BRAND} ${Build.MODEL}"
+
+/**
+ * A string representing the operating system information.
+ */
+private val osInfo: String get() = "\uD83E\uDD16 ${Build.VERSION.RELEASE}@${Build.VERSION.SDK_INT}"
+
+/**
+ * A string representing the build information.
+ */
+private val buildInfo: String
+    get() = "\uD83D\uDCE6 $buildTypeName" +
+        buildFlavorName.takeUnless { it.isBlank() }?.let { " $it" }.orEmpty()
diff --git a/cmp-android/src/main/kotlin/cmp/android/app/ComponentActivityExtensions.kt b/cmp-android/src/main/kotlin/cmp/android/app/ComponentActivityExtensions.kt
index 2c0118991..7d4af98bc 100644
--- a/cmp-android/src/main/kotlin/cmp/android/app/ComponentActivityExtensions.kt
+++ b/cmp-android/src/main/kotlin/cmp/android/app/ComponentActivityExtensions.kt
@@ -5,29 +5,32 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package cmp.android.app
 
+import android.content.res.Configuration
+import android.graphics.Color
 import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
+import androidx.core.util.Consumer
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import cmp.android.app.util.isSystemInDarkModeFlow
+import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
-import org.mifos.mobile.core.model.MifosThemeConfig
+import org.mifos.core.model.DarkThemeConfig
 
 @ColorInt
-private val SCRIM_COLOR: Int = Color.Transparent.toArgb()
+private val SCRIM_COLOR: Int = Color.TRANSPARENT
 
 /**
  * Helper method to handle edge-to-edge logic for dark mode.
@@ -37,7 +40,7 @@ private val SCRIM_COLOR: Int = Color.Transparent.toArgb()
  */
 @Suppress("MaxLineLength")
 fun ComponentActivity.setupEdgeToEdge(
-    appThemeFlow: Flow<MifosThemeConfig>,
+    appThemeFlow: Flow<DarkThemeConfig>,
 ) {
     lifecycleScope.launch {
         lifecycle.repeatOnLifecycle(state = Lifecycle.State.STARTED) {
@@ -45,18 +48,8 @@ fun ComponentActivity.setupEdgeToEdge(
                 isSystemInDarkModeFlow(),
                 appThemeFlow,
             ) { isSystemDarkMode, appTheme ->
-
-                val currentNightMode = AppCompatDelegate.getDefaultNightMode()
-                if (currentNightMode != appTheme.osValue) {
-                    AppCompatDelegate.setDefaultNightMode(appTheme.osValue)
-                }
-
-                when (appTheme.osValue) {
-                    AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM -> isSystemDarkMode
-                    AppCompatDelegate.MODE_NIGHT_YES -> true
-                    AppCompatDelegate.MODE_NIGHT_NO -> false
-                    else -> isSystemDarkMode
-                }
+                AppCompatDelegate.setDefaultNightMode(appTheme.osValue)
+                appTheme.isDarkMode(isSystemDarkMode = isSystemDarkMode)
             }
                 .distinctUntilChanged()
                 .collect { isDarkMode ->
@@ -66,10 +59,28 @@ fun ComponentActivity.setupEdgeToEdge(
                     val style = SystemBarStyle.auto(
                         darkScrim = SCRIM_COLOR,
                         lightScrim = SCRIM_COLOR,
-                        detectDarkMode = { isDarkMode },
+                        // Disabling Dark Mode for this app
+                        detectDarkMode = { false },
                     )
                     enableEdgeToEdge(statusBarStyle = style, navigationBarStyle = style)
                 }
         }
     }
 }
+
+/**
+ * Adds a configuration change listener to retrieve whether system is in
+ * dark theme or not. This will emit current status immediately and then
+ * will emit changes as needed.
+ */
+private fun ComponentActivity.isSystemInDarkModeFlow(): Flow<Boolean> =
+    callbackFlow {
+        channel.trySend(element = resources.configuration.isSystemInDarkMode)
+        val listener = Consumer<Configuration> {
+            channel.trySend(element = it.isSystemInDarkMode)
+        }
+        addOnConfigurationChangedListener(listener = listener)
+        awaitClose { removeOnConfigurationChangedListener(listener = listener) }
+    }
+        .distinctUntilChanged()
+        .conflate()
diff --git a/cmp-android/src/main/kotlin/cmp/android/app/ConfigurationExtension.kt b/cmp-android/src/main/kotlin/cmp/android/app/ConfigurationExtension.kt
new file mode 100644
index 000000000..cf4c540f4
--- /dev/null
+++ b/cmp-android/src/main/kotlin/cmp/android/app/ConfigurationExtension.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package cmp.android.app
+
+import android.content.res.Configuration
+
+val Configuration.isSystemInDarkMode
+    get() = (uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
diff --git a/cmp-android/src/main/kotlin/cmp/android/app/MainActivity.kt b/cmp-android/src/main/kotlin/cmp/android/app/MainActivity.kt
index 831a2cf0f..7738e2c93 100644
--- a/cmp-android/src/main/kotlin/cmp/android/app/MainActivity.kt
+++ b/cmp-android/src/main/kotlin/cmp/android/app/MainActivity.kt
@@ -5,83 +5,117 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package cmp.android.app
 
 import android.os.Bundle
+import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.runtime.getValue
 import androidx.core.os.LocaleListCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import cmp.shared.SharedApp
 import io.github.vinceglb.filekit.FileKit
 import io.github.vinceglb.filekit.dialogs.init
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 import org.koin.android.ext.android.inject
-import org.mifos.mobile.core.datastore.UserPreferencesRepository
-import org.mifos.mobile.core.ui.utils.ShareUtils
-import template.core.base.platform.LocalManagerProvider
+import org.mifos.core.data.repository.NetworkMonitor
+import org.mifos.core.data.repository.UserDataRepository
+import template.core.base.analytics.AnalyticsHelper
+import template.core.base.analytics.lifecycleTracker
+import template.core.base.platform.update.AppUpdateManager
+import template.core.base.platform.update.AppUpdateManagerImpl
+import template.core.base.ui.ShareUtils
 import java.util.Locale
-import kotlin.getValue
 
 /**
- * Main activity class.
- * This class is used to set the content view of the activity.
+ * Main activity class. This class is used to set the content view of the
+ * activity.
  *
  * @constructor Create empty Main activity
  * @see ComponentActivity
  */
+@Suppress("UnusedPrivateProperty")
 class MainActivity : ComponentActivity() {
-    /**
-     * Called when the activity is starting.
-     * This is where most initialization should go: calling [setContentView(int)] to inflate the activity's UI,
-     */
 
-    private val userPreferencesRepository: UserPreferencesRepository by inject()
+    private lateinit var appUpdateManager: AppUpdateManager
+
+    private val userPreferencesRepository: UserDataRepository by inject()
+
+    private val networkMonitor: NetworkMonitor by inject()
+
+    private val analyticsHelper: AnalyticsHelper by inject()
+    private val lifecycleTracker by lazy { analyticsHelper.lifecycleTracker() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        runBlocking {
-            val userThemeConfig = userPreferencesRepository.observeDarkThemeConfig.first()
-            AppCompatDelegate.setDefaultNightMode(userThemeConfig.osValue)
-        }
-
         var shouldShowSplashScreen = true
         installSplashScreen().setKeepOnScreenCondition { shouldShowSplashScreen }
 
+        super.onCreate(savedInstanceState)
+        appUpdateManager = AppUpdateManagerImpl(this)
+
         val darkThemeConfigFlow = userPreferencesRepository.observeDarkThemeConfig
 
-        WindowCompat.setDecorFitsSystemWindows(window, false)
         setupEdgeToEdge(darkThemeConfigFlow)
+
         ShareUtils.setActivityProvider { return@setActivityProvider this }
         FileKit.init(this)
-        /**
-         * Set the content view of the activity.
-         * @see setContent
-         */
+
+        analyticsHelper.setUserId(deviceData)
+
         setContent {
-            LocalManagerProvider(context = this) {
-                SharedApp(
-                    handleThemeMode = {
-                        AppCompatDelegate.setDefaultNightMode(it)
-                    },
-                    handleAppLocale = {
-                        it?.let {
-                            AppCompatDelegate.setApplicationLocales(
-                                LocaleListCompat.forLanguageTags(it),
-                            )
-                            Locale.setDefault(Locale(it))
-                        }
-                    },
-                    onSplashScreenRemoved = {
-                        shouldShowSplashScreen = false
-                    },
-                )
+            val status by networkMonitor.isOnline.collectAsStateWithLifecycle(false)
+
+            if (status) {
+                appUpdateManager.checkForAppUpdate()
             }
+
+            lifecycleTracker.markAppLaunchComplete()
+
+            SharedApp(
+                updateScreenCapture = ::updateScreenCapture,
+                handleRecreate = ::handleRecreate,
+                handleThemeMode = {
+                    AppCompatDelegate.setDefaultNightMode(it)
+                },
+                handleAppLocale = {
+                    it?.let {
+                        AppCompatDelegate.setApplicationLocales(
+                            LocaleListCompat.forLanguageTags(it),
+                        )
+                        Locale.setDefault(Locale(it))
+                    }
+                },
+                onSplashScreenRemoved = {
+                    shouldShowSplashScreen = false
+                },
+            )
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        appUpdateManager.checkForResumeUpdateState()
+        lifecycleTracker.markAppBackground()
+    }
+
+    override fun onStart() {
+        super.onStart()
+        lifecycleTracker.markAppLaunchStart()
+    }
+
+    private fun handleRecreate() {
+        recreate()
+    }
+
+    private fun updateScreenCapture(isScreenCaptureAllowed: Boolean) {
+        if (isScreenCaptureAllowed) {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+        } else {
+            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
         }
     }
 }
diff --git a/cmp-android/src/prod/AndroidManifest.xml b/cmp-android/src/prod/AndroidManifest.xml
new file mode 100644
index 000000000..0d211bbf9
--- /dev/null
+++ b/cmp-android/src/prod/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application>
+
+        <meta-data
+            android:name="google_analytics_adid_collection_enabled"
+            android:value="true"
+            tools:replace="android:value" />
+
+        <!-- Enable Firebase analytics for `prod` builds -->
+        <meta-data
+            android:name="firebase_analytics_collection_deactivated"
+            android:value="false"
+            tools:replace="android:value" />
+
+        <meta-data
+            android:name="firebase_crashlytics_collection_enabled"
+            android:value="true"
+            tools:replace="android:value" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/cmp-desktop/build.gradle.kts b/cmp-desktop/build.gradle.kts
index 9ae1d463d..1dd0cc5bf 100644
--- a/cmp-desktop/build.gradle.kts
+++ b/cmp-desktop/build.gradle.kts
@@ -17,11 +17,9 @@ plugins {
 }
 
 kotlin {
-    jvm {
-        withJava()
-    }
+    jvm()
 
-    jvmToolchain(21)
+    jvmToolchain(17)
 
     sourceSets {
         jvmMain.dependencies {
@@ -33,32 +31,19 @@ kotlin {
             implementation(libs.kotlin.reflect)
 
             implementation(libs.koin.core)
-
-            implementation(compose.components.resources)
         }
     }
 }
 
-val appName: String = libs.versions.packageName.get()
-val packageNameSpace: String = libs.versions.packageNamespace.get()
-val appVersion: String = libs.versions.packageVersion.get()
+val appName: String = libs.versions.desktopPackageName.get()
+val packageNameSpace: String = libs.versions.desktopPackageNamespace.get()
+val appVersion: String = libs.versions.desktopPackageVersion.get()
 
 compose.desktop {
     application {
         mainClass = "MainKt"
-
-        val buildNumber: String = (project.findProperty("buildNumber") as String?) ?: "1"
-        val isAppStoreRelease: Boolean =
-            (project.findProperty("macOsAppStoreRelease") as String?)?.toBoolean() ?: false
-
         nativeDistributions {
-            targetFormats(
-                TargetFormat.Pkg,
-                TargetFormat.Dmg,
-                TargetFormat.Msi,
-                TargetFormat.Exe,
-                TargetFormat.Deb
-            )
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Exe, TargetFormat.Deb)
             packageName = appName
             packageVersion = appVersion
             description = "Desktop Application"
@@ -66,39 +51,16 @@ compose.desktop {
             vendor = "Mifos Initiative"
             licenseFile.set(project.file("../LICENSE"))
             includeAllModules = true
-            outputBaseDir.set(project.layout.buildDirectory.dir("release"))
 
             macOS {
                 bundleID = packageNameSpace
                 dockName = appName
                 iconFile.set(project.file("icons/ic_launcher.icns"))
-                minimumSystemVersion = "12.0"
-                appStore = isAppStoreRelease
-
-                infoPlist {
-                    packageBuildVersion = buildNumber
-                    extraKeysRawXml = """
-                    <key>ITSAppUsesNonExemptEncryption</key>
-                    <false/>
-                """.trimIndent()
-                }
-
-                if (isAppStoreRelease) {
-                    signing {
-                        sign.set(true)
-                        identity.set("The Mifos Initiative")
-                    }
-                    provisioningProfile.set(project.file("embedded.provisionprofile"))
-                    runtimeProvisioningProfile.set(project.file("runtime.provisionprofile"))
-                    entitlementsFile.set(project.file("entitlements.plist"))
-                    runtimeEntitlementsFile.set(project.file("runtime-entitlements.plist"))
-                } else {
-                    notarization {
-                        val providers = project.providers
-                        appleID.set(providers.environmentVariable("NOTARIZATION_APPLE_ID"))
-                        password.set(providers.environmentVariable("NOTARIZATION_PASSWORD"))
-                        teamID.set(providers.environmentVariable("NOTARIZATION_TEAM_ID"))
-                    }
+                notarization {
+                    val providers = project.providers
+                    appleID.set(providers.environmentVariable("NOTARIZATION_APPLE_ID"))
+                    password.set(providers.environmentVariable("NOTARIZATION_PASSWORD"))
+                    teamID.set(providers.environmentVariable("NOTARIZATION_TEAM_ID"))
                 }
             }
 
@@ -116,36 +78,9 @@ compose.desktop {
             }
         }
         buildTypes.release.proguard {
-            isEnabled = false
-//            configurationFiles.from(file("compose-desktop.pro"))
-//            obfuscate.set(true)
-//            optimize.set(true)
+            configurationFiles.from(file("compose-desktop.pro"))
+            obfuscate.set(true)
+            optimize.set(true)
         }
     }
 }
-
-/**
- * Removes the `com.apple.quarantine` extended attribute from the built `.app`.
- *
- * Why:
- * Gatekeeper may mark files from the Internet with `com.apple.quarantine`.
- * If any such file ends up inside the `.app`, App Store validation can fail.
- */
-val unquarantineApp = tasks.register<Exec>("unquarantineMacApp") {
-    group = "macOS"
-    description = "Remove com.apple.quarantine from the built .app before signing"
-    onlyIf { org.gradle.internal.os.OperatingSystem.current().isMacOsX }
-
-    dependsOn("createReleaseDistributable")
-
-    val appName = "$appName.app" // set to your final .app name
-    val appPath = layout.buildDirectory
-        .dir("release/main-release/app/$appName")
-        .map { it.asFile.absolutePath }
-
-    commandLine("xattr", "-dr", "com.apple.quarantine", appPath.get())
-}
-
-tasks.matching { it.name == "packageReleasePkg" }.configureEach {
-    dependsOn(unquarantineApp)
-}
diff --git a/cmp-desktop/src/jvmMain/kotlin/main.kt b/cmp-desktop/src/jvmMain/kotlin/main.kt
index 8d9a6853c..3553fa7cc 100644
--- a/cmp-desktop/src/jvmMain/kotlin/main.kt
+++ b/cmp-desktop/src/jvmMain/kotlin/main.kt
@@ -12,10 +12,7 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import cmp.shared.SharedApp
-import cmp.shared.generated.resources.Res
-import cmp.shared.generated.resources.application_title
 import cmp.shared.utils.initKoin
-import org.jetbrains.compose.resources.stringResource
 
 /**
  * Main function.
@@ -43,13 +40,15 @@ fun main() {
         Window(
             onCloseRequest = ::exitApplication,
             state = windowState,
-            title = stringResource(Res.string.application_title),
+            title = "DesktopApp",
         ) {
             // Sets the content of the window.
             SharedApp(
+                updateScreenCapture = {},
+                handleRecreate = {},
                 handleThemeMode = {},
                 handleAppLocale = {},
-                onSplashScreenRemoved = {},
+                onSplashScreenRemoved = {}
             )
         }
     }
diff --git a/cmp-ios/Configuration/Config.xcconfig b/cmp-ios/Configuration/Config.xcconfig
index ce3c249ae..a23634af6 100644
--- a/cmp-ios/Configuration/Config.xcconfig
+++ b/cmp-ios/Configuration/Config.xcconfig
@@ -1,3 +1,3 @@
 TEAM_ID=L432S2FZP5
-BUNDLE_ID=org.mifos.mobile
-APP_NAME=Mifos Mobile
+BUNDLE_ID=cmp.ios
+APP_NAME=LiteDo
\ No newline at end of file
diff --git a/cmp-ios/Podfile b/cmp-ios/Podfile
index 0f05686a7..fd91d3575 100644
--- a/cmp-ios/Podfile
+++ b/cmp-ios/Podfile
@@ -1,21 +1,13 @@
-deployment_target = '16.0'
+source 'https://cdn.cocoapods.org'
+platform :ios, '16.0'
+use_frameworks!
 
 target 'iosApp' do
-  use_frameworks!
-  platform :ios, deployment_target
-  # Pods for iosApp
+  project 'iosApp.xcodeproj'
   pod 'cmp_shared', :path => '../cmp-shared'
-end
 
-post_install do |installer|
-    installer.generated_projects.each do |project|
-        project.targets.each do |target|
-            target.build_configurations.each do |config|
-                config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
-            end
-        end
-        project.build_configurations.each do |config|
-            config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
-        end
-    end
+  # Native Firebase iOS Pods required by firebase-kotlin-sdk
+  pod 'FirebaseCore'
+  pod 'FirebaseAnalytics'
+  pod 'FirebaseCrashlytics'
 end
\ No newline at end of file
diff --git a/cmp-ios/iosApp.xcodeproj/project.pbxproj b/cmp-ios/iosApp.xcodeproj/project.pbxproj
index 1cbac6655..04c6ae538 100644
--- a/cmp-ios/iosApp.xcodeproj/project.pbxproj
+++ b/cmp-ios/iosApp.xcodeproj/project.pbxproj
@@ -9,22 +9,22 @@
 /* Begin PBXBuildFile section */
 		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
 		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
-		1C3FE2006C77932769810076 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6DF4DB1CF5E68C5614135A56 /* Pods_iosApp.framework */; };
 		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
+		73867D86E599B875F7561EBD /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B63CDEE6A83A279F370FDF /* Pods_iosApp.framework */; };
 		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
-		1EB8E354CA5D35F960D11D5D /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = "<group>"; };
 		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
-		6DF4DB1CF5E68C5614135A56 /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7555FF7B242A565900829871 /* Mifos Mobile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mifos Mobile.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF7B242A565900829871 /* LiteDo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LiteDo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		8DADAFB5E75F5E24CA4F0EB4 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = "<group>"; };
 		AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
+		B5AB1CF32380D00920DC66AD /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = "<group>"; };
+		F8B63CDEE6A83A279F370FDF /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		FCFBF765CF1AE0CE66538ADF /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -32,7 +32,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				1C3FE2006C77932769810076 /* Pods_iosApp.framework in Frameworks */,
+				73867D86E599B875F7561EBD /* Pods_iosApp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -47,19 +47,10 @@
 			path = "Preview Content";
 			sourceTree = "<group>";
 		};
-		1826950F674A72E12E219090 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				8DADAFB5E75F5E24CA4F0EB4 /* Pods-iosApp.debug.xcconfig */,
-				1EB8E354CA5D35F960D11D5D /* Pods-iosApp.release.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		42799AB246E5F90AF97AA0EF /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				6DF4DB1CF5E68C5614135A56 /* Pods_iosApp.framework */,
+				F8B63CDEE6A83A279F370FDF /* Pods_iosApp.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -71,14 +62,14 @@
 				7555FF7D242A565900829871 /* iosApp */,
 				7555FF7C242A565900829871 /* Products */,
 				42799AB246E5F90AF97AA0EF /* Frameworks */,
-				1826950F674A72E12E219090 /* Pods */,
+				AF5B1102F079B671D1EB1074 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
 		7555FF7C242A565900829871 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				7555FF7B242A565900829871 /* Mifos Mobile.app */,
+				7555FF7B242A565900829871 /* LiteDo.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -103,6 +94,15 @@
 			path = Configuration;
 			sourceTree = "<group>";
 		};
+		AF5B1102F079B671D1EB1074 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				B5AB1CF32380D00920DC66AD /* Pods-iosApp.debug.xcconfig */,
+				FCFBF765CF1AE0CE66538ADF /* Pods-iosApp.release.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -110,11 +110,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */;
 			buildPhases = (
-				D005710AF42AFBD3373CBB90 /* [CP] Check Pods Manifest.lock */,
+				C0BDCDFA5D651BAABC1D1A96 /* [CP] Check Pods Manifest.lock */,
 				7555FF77242A565900829871 /* Sources */,
 				B92378962B6B1156000C7307 /* Frameworks */,
 				7555FF79242A565900829871 /* Resources */,
-				3843B476B28208558ACE8C15 /* [CP] Copy Pods Resources */,
+				F3CE6A35EE97CC26402CBE37 /* [CP] Embed Pods Frameworks */,
+				087C63914A01F15B2F3377F1 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -122,7 +123,7 @@
 			);
 			name = iosApp;
 			productName = iosApp;
-			productReference = 7555FF7B242A565900829871 /* Mifos Mobile.app */;
+			productReference = 7555FF7B242A565900829871 /* LiteDo.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -172,7 +173,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3843B476B28208558ACE8C15 /* [CP] Copy Pods Resources */ = {
+		087C63914A01F15B2F3377F1 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -189,7 +190,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D005710AF42AFBD3373CBB90 /* [CP] Check Pods Manifest.lock */ = {
+		C0BDCDFA5D651BAABC1D1A96 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -211,6 +212,23 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		F3CE6A35EE97CC26402CBE37 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -350,7 +368,7 @@
 		};
 		7555FFA6242A565B00829871 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 8DADAFB5E75F5E24CA4F0EB4 /* Pods-iosApp.debug.xcconfig */;
+			baseConfigurationReference = B5AB1CF32380D00920DC66AD /* Pods-iosApp.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -363,8 +381,8 @@
 					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = iosApp/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Mifos Mobile";
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
+				INFOPLIST_KEY_CFBundleDisplayName = LiteDo;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.3;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -372,6 +390,7 @@
 				);
 				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.mifos.kmp.template;
 				PRODUCT_NAME = "${APP_NAME}";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -381,21 +400,22 @@
 		};
 		7555FFA7242A565B00829871 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1EB8E354CA5D35F960D11D5D /* Pods-iosApp.release.xcconfig */;
+			baseConfigurationReference = FCFBF765CF1AE0CE66538ADF /* Pods-iosApp.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
-				DEVELOPMENT_TEAM = "${TEAM_ID}";
+				DEVELOPMENT_TEAM = L432S2FZP5;
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
+					"$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
 				INFOPLIST_FILE = iosApp/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Mifos Mobile";
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
+				INFOPLIST_KEY_CFBundleDisplayName = LiteDo;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.3;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -403,6 +423,7 @@
 				);
 				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = org.mifos.kmp.template;
 				PRODUCT_NAME = "${APP_NAME}";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
diff --git a/cmp-ios/iosApp.xcodeproj/project.xcworkspace/xcuserdata/hekmatullahamin.xcuserdatad/UserInterfaceState.xcuserstate b/cmp-ios/iosApp.xcodeproj/project.xcworkspace/xcuserdata/hekmatullahamin.xcuserdatad/UserInterfaceState.xcuserstate
index 86c5772eb6346be4e7f691a13427cd955f8a275a..d70f71e4c90971dfa0f500ef3755387336f8bba7 100644
GIT binary patch
literal 34158
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

delta 13587
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
G=Dz?}a<H`k

diff --git a/cmp-ios/iosApp.xcodeproj/xcuserdata/hekmatullahamin.xcuserdatad/xcschemes/xcschememanagement.plist b/cmp-ios/iosApp.xcodeproj/xcuserdata/hekmatullahamin.xcuserdatad/xcschemes/xcschememanagement.plist
index aede5d13b..56b5955f8 100644
--- a/cmp-ios/iosApp.xcodeproj/xcuserdata/hekmatullahamin.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/cmp-ios/iosApp.xcodeproj/xcuserdata/hekmatullahamin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,7 +4,7 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>cmp-ios.xcscheme_^#shared#^_</key>
+		<key>iosApp.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
diff --git a/cmp-ios/iosApp.xcodeproj/xcuserdata/skniyajali.xcuserdatad/xcschemes/iosApp.xcscheme b/cmp-ios/iosApp.xcodeproj/xcuserdata/skniyajali.xcuserdatad/xcschemes/iosApp.xcscheme
new file mode 100644
index 000000000..d9679030b
--- /dev/null
+++ b/cmp-ios/iosApp.xcodeproj/xcuserdata/skniyajali.xcuserdatad/xcschemes/iosApp.xcscheme
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   version = "1.3">
+   <BuildAction>
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForRunning = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7555FF7A242A565900829871"
+               BuildableName = "LiteDo.app"
+               BlueprintName = "iosApp"
+               ReferencedContainer = "container:iosApp.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <LaunchAction
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7555FF7A242A565900829871"
+            BuildableName = "LiteDo.app"
+            BlueprintName = "iosApp"
+            ReferencedContainer = "container:iosApp.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+</Scheme>
diff --git a/cmp-ios/iosApp.xcodeproj/xcuserdata/skniyajali.xcuserdatad/xcschemes/xcschememanagement.plist b/cmp-ios/iosApp.xcodeproj/xcuserdata/skniyajali.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 000000000..fa59f97d5
--- /dev/null
+++ b/cmp-ios/iosApp.xcodeproj/xcuserdata/skniyajali.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>iosApp.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/cmp-ios/iosApp.xcworkspace/xcuserdata/skniyajali.xcuserdatad/xcschemes/xcschememanagement.plist b/cmp-ios/iosApp.xcworkspace/xcuserdata/skniyajali.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 000000000..ee3458dd7
--- /dev/null
+++ b/cmp-ios/iosApp.xcworkspace/xcuserdata/skniyajali.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict />
+</plist>
diff --git a/cmp-ios/iosApp/ContentView.swift b/cmp-ios/iosApp/ContentView.swift
index e130b8a2e..63b9da7e0 100644
--- a/cmp-ios/iosApp/ContentView.swift
+++ b/cmp-ios/iosApp/ContentView.swift
@@ -13,7 +13,8 @@ struct ComposeView: UIViewControllerRepresentable {
 struct ContentView: View {
     var body: some View {
         ComposeView()
-                .ignoresSafeArea(.keyboard) // Compose has own keyboard handler
+                .ignoresSafeArea(edges: .all)
+                .ignoresSafeArea(.keyboard) // .ignoresSafeArea(.keyboard) // Compose has own keyboard handler
     }
 }
 
diff --git a/cmp-ios/iosApp/Info.plist b/cmp-ios/iosApp/Info.plist
index 597a03ea9..dfcda749a 100644
--- a/cmp-ios/iosApp/Info.plist
+++ b/cmp-ios/iosApp/Info.plist
@@ -17,19 +17,13 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
+	<string>11</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSCameraUsageDescription</key>
-	<string>We use the camera to scan QR codes for payments and to add beneficiaries. No images or video are stored.</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Allow access to choose a photo or document you decide to upload (e.g., profile photo or ID).</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Allow access to choose a photo or document you decide to upload (e.g., profile photo or ID).</string>
+	<string>Allow access to add photos to your library so you can save artworks directly to your device and view them offline.</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
diff --git a/cmp-shared/build.gradle.kts b/cmp-shared/build.gradle.kts
index d548fabb5..c78a117d2 100644
--- a/cmp-shared/build.gradle.kts
+++ b/cmp-shared/build.gradle.kts
@@ -5,30 +5,37 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 
 plugins {
+    alias(libs.plugins.kmp.library.convention)
     alias(libs.plugins.cmp.feature.convention)
-    alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.kotlinCocoapods)
 }
 
 kotlin {
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "ComposeApp"
+            isStatic = true
+            optimized = true
+        }
+    }
 
     sourceSets {
         commonMain.dependencies {
             // Navigation Modules
             implementation(projects.cmpNavigation)
             implementation(compose.components.resources)
-            api(projects.core.data)
-            api(projects.core.network)
-            //put your multiplatform dependencies here
-            implementation(compose.material)
-            implementation(compose.material3)
+            implementation(projects.coreBase.platform)
+            implementation(projects.coreBase.ui)
+
+            implementation(libs.coil.kt.compose)
         }
 
         desktopMain.dependencies {
@@ -40,7 +47,7 @@ kotlin {
 
     cocoapods {
         summary = "KMP Shared Module"
-        homepage = "https://github.com/openMF/mifos-mobile"
+        homepage = "https://github.com/openMF/kmp-project-template"
         version = "1.0"
         ios.deploymentTarget = "16.0"
         podfile = project.file("../cmp-ios/Podfile")
diff --git a/cmp-shared/cmp_shared.podspec b/cmp-shared/cmp_shared.podspec
index 7094d449a..a81166694 100644
--- a/cmp-shared/cmp_shared.podspec
+++ b/cmp-shared/cmp_shared.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'cmp_shared'
     spec.version                  = '1.0'
-    spec.homepage                 = 'https://github.com/openMF/mifos-mobile'
+    spec.homepage                 = 'https://github.com/openMF/kmp-project-template'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''
     spec.license                  = ''
diff --git a/cmp-shared/src/commonMain/kotlin/cmp/shared/SharedApp.kt b/cmp-shared/src/commonMain/kotlin/cmp/shared/SharedApp.kt
index 91045f391..f28717e10 100644
--- a/cmp-shared/src/commonMain/kotlin/cmp/shared/SharedApp.kt
+++ b/cmp-shared/src/commonMain/kotlin/cmp/shared/SharedApp.kt
@@ -5,25 +5,38 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package cmp.shared
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import cmp.navigation.ComposeApp
+import coil3.compose.LocalPlatformContext
+import template.core.base.platform.LocalManagerProvider
+import template.core.base.platform.context.LocalContext
+import template.core.base.ui.LocalImageLoaderProvider
+import template.core.base.ui.getDefaultImageLoader
 
 @Composable
 fun SharedApp(
+    updateScreenCapture: (isScreenCaptureAllowed: Boolean) -> Unit,
+    handleRecreate: () -> Unit,
     handleThemeMode: (osValue: Int) -> Unit,
     handleAppLocale: (locale: String?) -> Unit,
-    onSplashScreenRemoved: () -> Unit,
     modifier: Modifier = Modifier,
+    onSplashScreenRemoved: () -> Unit,
 ) {
-    ComposeApp(
-        handleThemeMode = handleThemeMode,
-        handleAppLocale = handleAppLocale,
-        onSplashScreenRemoved = onSplashScreenRemoved,
-        modifier = modifier,
-    )
+    LocalManagerProvider(LocalContext.current) {
+        LocalImageLoaderProvider(getDefaultImageLoader(LocalPlatformContext.current)) {
+            ComposeApp(
+                updateScreenCapture = updateScreenCapture,
+                handleRecreate = handleRecreate,
+                handleThemeMode = handleThemeMode,
+                handleAppLocale = handleAppLocale,
+                onSplashScreenRemoved = onSplashScreenRemoved,
+                modifier = modifier,
+            )
+        }
+    }
 }
diff --git a/cmp-shared/src/commonMain/kotlin/cmp/shared/utils/KoinExt.kt b/cmp-shared/src/commonMain/kotlin/cmp/shared/utils/KoinExt.kt
index d5a794a77..55f64f0b1 100644
--- a/cmp-shared/src/commonMain/kotlin/cmp/shared/utils/KoinExt.kt
+++ b/cmp-shared/src/commonMain/kotlin/cmp/shared/utils/KoinExt.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package cmp.shared.utils
 
diff --git a/cmp-shared/src/nativeMain/kotlin/org/mifos/shared/ViewController.kt b/cmp-shared/src/nativeMain/kotlin/org/mifos/shared/ViewController.kt
index bcca05304..0f9114c9f 100644
--- a/cmp-shared/src/nativeMain/kotlin/org/mifos/shared/ViewController.kt
+++ b/cmp-shared/src/nativeMain/kotlin/org/mifos/shared/ViewController.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package org.mifos.shared
 
@@ -19,6 +19,8 @@ fun viewController() = ComposeUIViewController(
     },
 ) {
     SharedApp(
+        updateScreenCapture = {},
+        handleRecreate = {},
         handleThemeMode = {},
         handleAppLocale = {},
         onSplashScreenRemoved = {},
diff --git a/cmp-web/build.gradle.kts b/cmp-web/build.gradle.kts
index 5dec055ff..f07ed52b8 100644
--- a/cmp-web/build.gradle.kts
+++ b/cmp-web/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 kotlin {
     js(IR) {
-        moduleName = "cmp-web"
+        outputModuleName = "cmp-web"
         browser {
             commonWebpackConfig {
                 outputFileName = "cmp-web.js"
@@ -19,7 +19,7 @@ kotlin {
 
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
-        moduleName = "cmp-wasm"
+        outputModuleName = "cmp-wasm"
         browser {
             commonWebpackConfig {
                 outputFileName = "cmp-wasm.js"
@@ -51,6 +51,7 @@ kotlin {
                 implementation(libs.multiplatform.settings.coroutines)
 
                 implementation(libs.koin.core)
+                implementation(libs.ktor.client.js)
             }
         }
 
@@ -59,10 +60,6 @@ kotlin {
     }
 }
 
-tasks.register("jsBrowserRun") {
-    dependsOn("jsBrowserDevelopmentRun")
-}
-
 compose.resources {
     publicResClass = true
     generateResClass = always
diff --git a/cmp-web/src/jsMain/kotlin/Application.kt b/cmp-web/src/jsMain/kotlin/Application.kt
index 68bdefc70..f39b86177 100644
--- a/cmp-web/src/jsMain/kotlin/Application.kt
+++ b/cmp-web/src/jsMain/kotlin/Application.kt
@@ -21,9 +21,11 @@ fun main() {
     onWasmReady {
         ComposeViewport(document.body!!) {
             SharedApp(
+                updateScreenCapture = {},
+                handleRecreate = {},
                 handleThemeMode = {},
                 handleAppLocale = {},
-                onSplashScreenRemoved = {},
+                onSplashScreenRemoved = {}
             )
         }
     }
diff --git a/cmp-web/src/wasmJsMain/kotlin/Main.kt b/cmp-web/src/wasmJsMain/kotlin/Main.kt
index e91410a38..19df36e83 100644
--- a/cmp-web/src/wasmJsMain/kotlin/Main.kt
+++ b/cmp-web/src/wasmJsMain/kotlin/Main.kt
@@ -37,7 +37,7 @@ fun main() {
      * This window uses the canvas element with the ID "ComposeTarget" and has the title "WebApp".
      */
     CanvasBasedWindow(
-        title = "Mifos Mobile", // Window title
+        title = "WebApp", // Window title
         canvasElementId = "ComposeTarget", // The canvas element where the Compose UI will be rendered
     ) {
         /*
@@ -45,9 +45,11 @@ fun main() {
          * This function is responsible for setting up the entire UI structure of the app.
          */
         SharedApp(
+            updateScreenCapture = {},
+            handleRecreate = {},
             handleThemeMode = {},
             handleAppLocale = {},
-            onSplashScreenRemoved = {},
+            onSplashScreenRemoved = {}
         )
     }
 }
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
index 8bcd830b7..811d8cb04 100644
--- a/config/detekt/detekt.yml
+++ b/config/detekt/detekt.yml
@@ -137,7 +137,7 @@ complexity:
     threshold: 15
   ComplexCondition:
     active: true
-    threshold: 5
+    threshold: 4
   ComplexInterface:
     active: false
     threshold: 10
@@ -146,7 +146,7 @@ complexity:
     ignoreOverloaded: false
   CyclomaticComplexMethod:
     active: true
-    threshold: 25
+    threshold: 15
     ignoreSingleWhenExpression: false
     ignoreSimpleWhenEntries: false
     ignoreNestingFunctions: false
@@ -168,7 +168,7 @@ complexity:
     threshold: 600
   LongMethod:
     active: true
-    threshold: 180 #60
+    threshold: 150 #60
   LongParameterList:
     active: true
     # Updating Common values based on current scenario
@@ -186,7 +186,7 @@ complexity:
     ignoreArgumentsMatchingNames: false
   NestedBlockDepth:
     active: true
-    threshold: 6
+    threshold: 4
   NestedScopeFunctions:
     active: false
     threshold: 1
@@ -232,7 +232,7 @@ complexity:
     thresholdInFiles: 20
     thresholdInClasses: 20
     thresholdInInterfaces: 20
-    thresholdInObjects: 22
+    thresholdInObjects: 20
     thresholdInEnums: 20
     ignoreDeprecated: false
     ignorePrivate: false
@@ -432,6 +432,7 @@ naming:
         "**/androidInstrumentedTest/**",
         "**/jsTest/**",
         "**/iosTest/**",
+        "**/generated/**",
       ]
     functionPattern: "[a-z][a-zA-Z0-9]*"
     excludeClassPattern: "$^"
@@ -689,7 +690,7 @@ style:
     active: false
   DestructuringDeclarationWithTooManyEntries:
     active: true
-    maxDestructuringEntries: 4
+    maxDestructuringEntries: 3
   DoubleNegativeLambda:
     active: false
     negativeFunctions:
diff --git a/core-base/analytics/build.gradle.kts b/core-base/analytics/build.gradle.kts
index 2b7111a99..a4214c766 100644
--- a/core-base/analytics/build.gradle.kts
+++ b/core-base/analytics/build.gradle.kts
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 plugins {
     alias(libs.plugins.kmp.library.convention)
diff --git a/core-base/analytics/src/androidDemo/kotlin/template/core/base/analytics/di/AnalyticsModule.kt b/core-base/analytics/src/androidDemo/kotlin/template/core/base/analytics/di/AnalyticsModule.kt
index 90f9f515d..45bcfaff3 100644
--- a/core-base/analytics/src/androidDemo/kotlin/template/core/base/analytics/di/AnalyticsModule.kt
+++ b/core-base/analytics/src/androidDemo/kotlin/template/core/base/analytics/di/AnalyticsModule.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics.di
 
diff --git a/core-base/analytics/src/androidMain/AndroidManifest.xml b/core-base/analytics/src/androidMain/AndroidManifest.xml
index 37d31716e..afcf313e3 100644
--- a/core-base/analytics/src/androidMain/AndroidManifest.xml
+++ b/core-base/analytics/src/androidMain/AndroidManifest.xml
@@ -6,6 +6,6 @@
     If a copy of the MPL was not distributed with this file,
     You can obtain one at https://mozilla.org/MPL/2.0/.
 
-    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+    See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
 -->
 <manifest />
\ No newline at end of file
diff --git a/core-base/analytics/src/androidProd/kotlin/template.core.base.analytics/di/AnalyticsModule.kt b/core-base/analytics/src/androidProd/kotlin/template.core.base.analytics/di/AnalyticsModule.kt
index 3f398c109..1e09b2cb2 100644
--- a/core-base/analytics/src/androidProd/kotlin/template.core.base.analytics/di/AnalyticsModule.kt
+++ b/core-base/analytics/src/androidProd/kotlin/template.core.base.analytics/di/AnalyticsModule.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 @file:Suppress("InvalidPackageDeclaration")
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsEvent.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsEvent.kt
index d98030a9e..12ff75c86 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsEvent.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsEvent.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
@@ -255,11 +255,26 @@ object Types {
  *
  * @since 1.0.0
  */
-data class Param(val key: String, val value: String) {
-    init {
-        require(key.isNotBlank()) { "Parameter key cannot be blank" }
-        require(key.length <= 40) { "Parameter key cannot exceed 40 characters" }
-        require(value.length <= 100) { "Parameter value cannot exceed 100 characters" }
+@ConsistentCopyVisibility
+data class Param private constructor(
+    val key: String,
+    val value: String,
+) {
+    companion object {
+        private const val MAX_VALUE_LENGTH = 100
+        private const val MAX_KEY_LENGTH = 40
+        private const val FALLBACK_KEY = "unknown_param"
+
+        operator fun invoke(key: String, value: String): Param {
+            val safeKey = key
+                .takeIf { it.isNotBlank() }
+                ?.take(MAX_KEY_LENGTH)
+                ?: FALLBACK_KEY
+
+            val safeValue = value.take(MAX_VALUE_LENGTH)
+
+            return Param(safeKey, safeValue)
+        }
     }
 }
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsExtensions.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsExtensions.kt
index 848f7c7b1..cd521e79f 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsExtensions.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsExtensions.kt
@@ -5,11 +5,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 import kotlin.time.Duration
 import kotlin.time.DurationUnit
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsHelper.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsHelper.kt
index 00b6c997e..e4561bc06 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsHelper.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/AnalyticsHelper.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/NoOpAnalyticsHelper.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/NoOpAnalyticsHelper.kt
index b515ef192..4cd5a8225 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/NoOpAnalyticsHelper.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/NoOpAnalyticsHelper.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/PerformanceTracker.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/PerformanceTracker.kt
index d8fa77fa8..696a0643a 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/PerformanceTracker.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/PerformanceTracker.kt
@@ -5,11 +5,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 
 /** Performance tracking utilities for analytics */
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/StubAnalyticsHelper.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/StubAnalyticsHelper.kt
index cb8f26024..7b092612d 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/StubAnalyticsHelper.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/StubAnalyticsHelper.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/TestingUtils.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/TestingUtils.kt
index 4e48ab6a9..38b245938 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/TestingUtils.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/TestingUtils.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/UiHelpers.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/UiHelpers.kt
index 57bc2845d..6a7d71dba 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/UiHelpers.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/UiHelpers.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/ValidationUtils.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/ValidationUtils.kt
index 0f71384ef..bfb1440c0 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/ValidationUtils.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/ValidationUtils.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
diff --git a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/di/AnalyticsModule.kt b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/di/AnalyticsModule.kt
index c424346dd..ff4919044 100644
--- a/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/di/AnalyticsModule.kt
+++ b/core-base/analytics/src/commonMain/kotlin/template/core/base/analytics/di/AnalyticsModule.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics.di
 
diff --git a/core-base/analytics/src/desktopMain/kotlin/template/core/base/analytics/di/AnalyticsModule.desktop.kt b/core-base/analytics/src/desktopMain/kotlin/template/core/base/analytics/di/AnalyticsModule.desktop.kt
index 84b754df6..c82b116dc 100644
--- a/core-base/analytics/src/desktopMain/kotlin/template/core/base/analytics/di/AnalyticsModule.desktop.kt
+++ b/core-base/analytics/src/desktopMain/kotlin/template/core/base/analytics/di/AnalyticsModule.desktop.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics.di
 
diff --git a/core-base/analytics/src/jsMain/kotlin/template.core.base.analytics/di/AnalyticsModule.js.kt b/core-base/analytics/src/jsMain/kotlin/template.core.base.analytics/di/AnalyticsModule.js.kt
index 6f9b6f75e..1b3db40e5 100644
--- a/core-base/analytics/src/jsMain/kotlin/template.core.base.analytics/di/AnalyticsModule.js.kt
+++ b/core-base/analytics/src/jsMain/kotlin/template.core.base.analytics/di/AnalyticsModule.js.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 @file:Suppress("InvalidPackageDeclaration")
 
diff --git a/core-base/analytics/src/nativeMain/kotlin/template.core.base.analytics.di/AnalyticsModule.native.kt b/core-base/analytics/src/nativeMain/kotlin/template.core.base.analytics.di/AnalyticsModule.native.kt
index 530bacb71..369336f23 100644
--- a/core-base/analytics/src/nativeMain/kotlin/template.core.base.analytics.di/AnalyticsModule.native.kt
+++ b/core-base/analytics/src/nativeMain/kotlin/template.core.base.analytics.di/AnalyticsModule.native.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 @file:Suppress("InvalidPackageDeclaration")
 
diff --git a/core-base/analytics/src/nonJsCommonMain/kotlin/template/core/base/analytics/FirebaseAnalyticsHelper.kt b/core-base/analytics/src/nonJsCommonMain/kotlin/template/core/base/analytics/FirebaseAnalyticsHelper.kt
index a3a29eae8..bfa9814ba 100644
--- a/core-base/analytics/src/nonJsCommonMain/kotlin/template/core/base/analytics/FirebaseAnalyticsHelper.kt
+++ b/core-base/analytics/src/nonJsCommonMain/kotlin/template/core/base/analytics/FirebaseAnalyticsHelper.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics
 
diff --git a/core-base/analytics/src/wasmJsMain/kotlin/template/core/base/analytics/di/AnalyticsModule.wasmJs.kt b/core-base/analytics/src/wasmJsMain/kotlin/template/core/base/analytics/di/AnalyticsModule.wasmJs.kt
index 84b754df6..c82b116dc 100644
--- a/core-base/analytics/src/wasmJsMain/kotlin/template/core/base/analytics/di/AnalyticsModule.wasmJs.kt
+++ b/core-base/analytics/src/wasmJsMain/kotlin/template/core/base/analytics/di/AnalyticsModule.wasmJs.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.analytics.di
 
diff --git a/core-base/common/build.gradle.kts b/core-base/common/build.gradle.kts
index 1e1456274..246ece295 100644
--- a/core-base/common/build.gradle.kts
+++ b/core-base/common/build.gradle.kts
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 plugins {
     alias(libs.plugins.kmp.library.convention)
diff --git a/core-base/common/src/androidMain/AndroidManifest.xml b/core-base/common/src/androidMain/AndroidManifest.xml
index e60d7f745..8e3b49f55 100644
--- a/core-base/common/src/androidMain/AndroidManifest.xml
+++ b/core-base/common/src/androidMain/AndroidManifest.xml
@@ -6,7 +6,7 @@
     If a copy of the MPL was not distributed with this file,
     You can obtain one at https://mozilla.org/MPL/2.0/.
 
-    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+    See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
diff --git a/core-base/common/src/androidMain/kotlin/template/core/base/common/Parcelize.android.kt b/core-base/common/src/androidMain/kotlin/template/core/base/common/Parcelize.android.kt
index 4f9a1c7ba..e7d0f5e83 100644
--- a/core-base/common/src/androidMain/kotlin/template/core/base/common/Parcelize.android.kt
+++ b/core-base/common/src/androidMain/kotlin/template/core/base/common/Parcelize.android.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common
 
diff --git a/core-base/common/src/androidMain/kotlin/template/core/base/common/di/CommonModule.android.kt b/core-base/common/src/androidMain/kotlin/template/core/base/common/di/CommonModule.android.kt
index c293e2999..3b59da829 100644
--- a/core-base/common/src/androidMain/kotlin/template/core/base/common/di/CommonModule.android.kt
+++ b/core-base/common/src/androidMain/kotlin/template/core/base/common/di/CommonModule.android.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common.di
 
diff --git a/core-base/common/src/androidMain/kotlin/template/core/base/common/manager/DispatchManagerImpl.kt b/core-base/common/src/androidMain/kotlin/template/core/base/common/manager/DispatchManagerImpl.kt
index 73a934420..8268588f6 100644
--- a/core-base/common/src/androidMain/kotlin/template/core/base/common/manager/DispatchManagerImpl.kt
+++ b/core-base/common/src/androidMain/kotlin/template/core/base/common/manager/DispatchManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 @file:Suppress("ktlint:standard:filename", "MatchingDeclarationName")
 
diff --git a/core-base/common/src/commonMain/kotlin/template/core/base/common/DataState.kt b/core-base/common/src/commonMain/kotlin/template/core/base/common/DataState.kt
index b2d736a85..c10083246 100644
--- a/core-base/common/src/commonMain/kotlin/template/core/base/common/DataState.kt
+++ b/core-base/common/src/commonMain/kotlin/template/core/base/common/DataState.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common
 
diff --git a/core-base/common/src/commonMain/kotlin/template/core/base/common/DataStateExtensions.kt b/core-base/common/src/commonMain/kotlin/template/core/base/common/DataStateExtensions.kt
index 407862176..b33afa7ab 100644
--- a/core-base/common/src/commonMain/kotlin/template/core/base/common/DataStateExtensions.kt
+++ b/core-base/common/src/commonMain/kotlin/template/core/base/common/DataStateExtensions.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common
 
diff --git a/core-base/common/src/commonMain/kotlin/template/core/base/common/ImageExtension.kt b/core-base/common/src/commonMain/kotlin/template/core/base/common/ImageExtension.kt
index 39fa764dc..d58bad17b 100644
--- a/core-base/common/src/commonMain/kotlin/template/core/base/common/ImageExtension.kt
+++ b/core-base/common/src/commonMain/kotlin/template/core/base/common/ImageExtension.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common
 
diff --git a/core-base/common/src/commonMain/kotlin/template/core/base/common/Parcelize.kt b/core-base/common/src/commonMain/kotlin/template/core/base/common/Parcelize.kt
index fbd1b2e4a..dcbb90490 100644
--- a/core-base/common/src/commonMain/kotlin/template/core/base/common/Parcelize.kt
+++ b/core-base/common/src/commonMain/kotlin/template/core/base/common/Parcelize.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common
 
diff --git a/core-base/common/src/commonMain/kotlin/template/core/base/common/di/CommonModule.kt b/core-base/common/src/commonMain/kotlin/template/core/base/common/di/CommonModule.kt
index e78b98fd4..d1b0ce6db 100644
--- a/core-base/common/src/commonMain/kotlin/template/core/base/common/di/CommonModule.kt
+++ b/core-base/common/src/commonMain/kotlin/template/core/base/common/di/CommonModule.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common.di
 
diff --git a/core-base/common/src/commonMain/kotlin/template/core/base/common/manager/DispatcherManager.kt b/core-base/common/src/commonMain/kotlin/template/core/base/common/manager/DispatcherManager.kt
index f8bf3102c..5c686d4ad 100644
--- a/core-base/common/src/commonMain/kotlin/template/core/base/common/manager/DispatcherManager.kt
+++ b/core-base/common/src/commonMain/kotlin/template/core/base/common/manager/DispatcherManager.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common.manager
 
diff --git a/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/Parcelize.nonAndroid.kt b/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/Parcelize.nonAndroid.kt
index 54e898c35..c4070fb95 100644
--- a/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/Parcelize.nonAndroid.kt
+++ b/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/Parcelize.nonAndroid.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common
 
diff --git a/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/di/CommonModule.nonAndroid.kt b/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/di/CommonModule.nonAndroid.kt
index c293e2999..3b59da829 100644
--- a/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/di/CommonModule.nonAndroid.kt
+++ b/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/di/CommonModule.nonAndroid.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.common.di
 
diff --git a/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/manager/DispatchManagerImpl.kt b/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/manager/DispatchManagerImpl.kt
index c04acce84..3dbee647c 100644
--- a/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/manager/DispatchManagerImpl.kt
+++ b/core-base/common/src/nonAndroidMain/kotlin/template/core/base/common/manager/DispatchManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 @file:Suppress("ktlint:standard:filename", "MatchingDeclarationName")
 
diff --git a/core-base/database/build.gradle.kts b/core-base/database/build.gradle.kts
index bb9928297..d458eade7 100644
--- a/core-base/database/build.gradle.kts
+++ b/core-base/database/build.gradle.kts
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 import org.jetbrains.compose.compose
 
diff --git a/core-base/database/src/androidMain/kotlin/template/core/base/database/AppDatabaseFactory.kt b/core-base/database/src/androidMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
index 8fc9b4c48..302d3bff4 100644
--- a/core-base/database/src/androidMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
+++ b/core-base/database/src/androidMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.database
 
diff --git a/core-base/database/src/commonMain/kotlin/template/core/base/database/Room.kt b/core-base/database/src/commonMain/kotlin/template/core/base/database/Room.kt
index e935dd5f7..1fd6c12eb 100644
--- a/core-base/database/src/commonMain/kotlin/template/core/base/database/Room.kt
+++ b/core-base/database/src/commonMain/kotlin/template/core/base/database/Room.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.database
 
diff --git a/core-base/database/src/commonMain/kotlin/template/core/base/database/TypeConverter.kt b/core-base/database/src/commonMain/kotlin/template/core/base/database/TypeConverter.kt
index e708c2a5f..a7dc4d4ec 100644
--- a/core-base/database/src/commonMain/kotlin/template/core/base/database/TypeConverter.kt
+++ b/core-base/database/src/commonMain/kotlin/template/core/base/database/TypeConverter.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.database
 
diff --git a/core-base/database/src/desktopMain/kotlin/template/core/base/database/AppDatabaseFactory.kt b/core-base/database/src/desktopMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
index 6e5afe2ec..0584d68ef 100644
--- a/core-base/database/src/desktopMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
+++ b/core-base/database/src/desktopMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.database
 
diff --git a/core-base/database/src/nativeMain/kotlin/template/core/base/database/AppDatabaseFactory.kt b/core-base/database/src/nativeMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
index f217e646e..7b5aac1d2 100644
--- a/core-base/database/src/nativeMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
+++ b/core-base/database/src/nativeMain/kotlin/template/core/base/database/AppDatabaseFactory.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.database
 
diff --git a/core-base/database/src/nonJsCommonMain/kotlin/template/core/base/database/Room.nonJsCommon.kt b/core-base/database/src/nonJsCommonMain/kotlin/template/core/base/database/Room.nonJsCommon.kt
index f4762df10..9bf7f9a1d 100644
--- a/core-base/database/src/nonJsCommonMain/kotlin/template/core/base/database/Room.nonJsCommon.kt
+++ b/core-base/database/src/nonJsCommonMain/kotlin/template/core/base/database/Room.nonJsCommon.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.database
 
diff --git a/core-base/database/src/nonJsCommonMain/kotlin/template/core/base/database/TypeConverter.nonJsCommon.kt b/core-base/database/src/nonJsCommonMain/kotlin/template/core/base/database/TypeConverter.nonJsCommon.kt
index 3cc7c4000..a414eeed0 100644
--- a/core-base/database/src/nonJsCommonMain/kotlin/template/core/base/database/TypeConverter.nonJsCommon.kt
+++ b/core-base/database/src/nonJsCommonMain/kotlin/template/core/base/database/TypeConverter.nonJsCommon.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.database
 
diff --git a/core-base/designsystem/build.gradle.kts b/core-base/designsystem/build.gradle.kts
index 033a52f8f..4b06a3736 100644
--- a/core-base/designsystem/build.gradle.kts
+++ b/core-base/designsystem/build.gradle.kts
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 plugins {
     alias(libs.plugins.kmp.library.convention)
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptMaterialTheme.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptMaterialTheme.kt
index 16493bd56..7b4f2aa42 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptMaterialTheme.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptMaterialTheme.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptTheme.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptTheme.kt
index 9ea79808d..5098f1fe0 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptTheme.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptTheme.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptThemeExtensions.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptThemeExtensions.kt
index 5990b2606..086203c52 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptThemeExtensions.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/KptThemeExtensions.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/BounceAnimation.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/BounceAnimation.kt
index f9104b9a0..ec142c486 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/BounceAnimation.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/BounceAnimation.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.component
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptAnimationSpecs.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptAnimationSpecs.kt
index eb57a3b51..542f012e5 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptAnimationSpecs.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptAnimationSpecs.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.component
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptShimmerLoadingBox.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptShimmerLoadingBox.kt
index 5c993ed58..6036c161d 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptShimmerLoadingBox.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptShimmerLoadingBox.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.component
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptSnackbarHost.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptSnackbarHost.kt
index aeb451220..514744e0c 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptSnackbarHost.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptSnackbarHost.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.component
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptTopAppBar.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptTopAppBar.kt
index f69ed446a..695c9a147 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptTopAppBar.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/KptTopAppBar.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 @file:OptIn(ExperimentalMaterial3Api::class)
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/SlideTransition.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/SlideTransition.kt
index 8c5632beb..15d3cf880 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/SlideTransition.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/component/SlideTransition.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.component
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/ComponentStateHolder.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/ComponentStateHolder.kt
index e97385567..7815df866 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/ComponentStateHolder.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/ComponentStateHolder.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.core
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/KptComponent.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/KptComponent.kt
index baa9e2dc6..94066f4ee 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/KptComponent.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/KptComponent.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.core
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/KptTopAppBarConfiguration.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/KptTopAppBarConfiguration.kt
index c0781973e..901e21849 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/KptTopAppBarConfiguration.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/core/KptTopAppBarConfiguration.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.core
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveListDetailPaneScaffold.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveListDetailPaneScaffold.kt
index a8df05c03..265b89367 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveListDetailPaneScaffold.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveListDetailPaneScaffold.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigableListDetailScaffold.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigableListDetailScaffold.kt
index f416f712b..3d5df1427 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigableListDetailScaffold.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigableListDetailScaffold.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigableSupportingPaneScaffold.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigableSupportingPaneScaffold.kt
index 200a4087e..1f3444862 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigableSupportingPaneScaffold.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigableSupportingPaneScaffold.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigationSuiteScaffold.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigationSuiteScaffold.kt
index 80a548ce8..14d8183c7 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigationSuiteScaffold.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/AdaptiveNavigationSuiteScaffold.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptFlowColumn.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptFlowColumn.kt
index 4f607da44..8222f3ab0 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptFlowColumn.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptFlowColumn.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptFlowRow.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptFlowRow.kt
index 5ebd108ac..c07c5ef02 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptFlowRow.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptFlowRow.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptGrid.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptGrid.kt
index e563b27d3..498edd508 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptGrid.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptGrid.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptMasonryGrid.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptMasonryGrid.kt
index e3ddfc6ad..6ad2338a5 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptMasonryGrid.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptMasonryGrid.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptResponsiveLayout.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptResponsiveLayout.kt
index 4e9dc8848..e1d0af5b7 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptResponsiveLayout.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptResponsiveLayout.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptSidebarLayout.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptSidebarLayout.kt
index e71824c5c..4d1a8c395 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptSidebarLayout.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptSidebarLayout.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptSplitPane.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptSplitPane.kt
index 8b3b355e1..fbc7a2b19 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptSplitPane.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptSplitPane.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptStack.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptStack.kt
index 1d961518b..545a1b4d6 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptStack.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/layout/KptStack.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.layout
 
diff --git a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/theme/KptColorSchemeImpl.kt b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/theme/KptColorSchemeImpl.kt
index 89f0f7fcb..95972a624 100644
--- a/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/theme/KptColorSchemeImpl.kt
+++ b/core-base/designsystem/src/commonMain/kotlin/template/core/base/designsystem/theme/KptColorSchemeImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.designsystem.theme
 
diff --git a/core-base/network/build.gradle.kts b/core-base/network/build.gradle.kts
index 328896039..0a58def30 100644
--- a/core-base/network/build.gradle.kts
+++ b/core-base/network/build.gradle.kts
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 plugins {
     alias(libs.plugins.kmp.library.convention)
@@ -13,7 +13,7 @@ plugins {
 }
 
 android {
-    namespace = "org.mifos.corebase.network"
+    namespace = "template.core.base.network"
 }
 
 kotlin {
diff --git a/core-base/network/src/androidMain/kotlin/template/core/base/network/KtorHttpClient.android.kt b/core-base/network/src/androidMain/kotlin/template/core/base/network/KtorHttpClient.android.kt
new file mode 100644
index 000000000..65edfc330
--- /dev/null
+++ b/core-base/network/src/androidMain/kotlin/template/core/base/network/KtorHttpClient.android.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.okhttp.OkHttp
+
+actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
+    config(this)
+}
diff --git a/core-base/network/src/commonMain/kotlin/template/core/base/network/KtorHttpClient.kt b/core-base/network/src/commonMain/kotlin/template/core/base/network/KtorHttpClient.kt
new file mode 100644
index 000000000..e9d9584f4
--- /dev/null
+++ b/core-base/network/src/commonMain/kotlin/template/core/base/network/KtorHttpClient.kt
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.auth.Auth
+import io.ktor.client.plugins.auth.providers.BasicAuthCredentials
+import io.ktor.client.plugins.auth.providers.BearerTokens
+import io.ktor.client.plugins.auth.providers.DigestAuthCredentials
+import io.ktor.client.plugins.auth.providers.basic
+import io.ktor.client.plugins.auth.providers.bearer
+import io.ktor.client.plugins.auth.providers.digest
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.defaultRequest
+import io.ktor.client.plugins.logging.DEFAULT
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logger
+import io.ktor.client.plugins.logging.Logging
+import io.ktor.http.HttpHeaders
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.json.Json
+import co.touchlab.kermit.Logger.Companion as KermitLogger
+
+expect fun httpClient(config: HttpClientConfig<*>.() -> Unit): HttpClient
+
+/**
+ * Provides a default [HttpClientConfig] setup for use with a Ktor-based HTTP client.
+ *
+ * This function simplifies client configuration by handling common concerns such as:
+ * - Authentication (Bearer, Basic, Digest)
+ * - Default headers
+ * - Timeouts
+ * - Logging
+ * - JSON serialization
+ *
+ * It can be passed directly into a Ktor client builder via the `config` lambda:
+ * ```kotlin
+ * val client = httpClient(setupDefaultHttpClient(baseUrl = "https://api.example.com"))
+ * ```
+ *
+ * @param baseUrl The base URL to be applied to all requests unless explicitly overridden.
+ * @param authRequiredUrl A list of hostnames that require authentication.
+ * @param defaultHeaders Headers that are applied to every request.
+ * @param requestTimeout Timeout in milliseconds for entire request lifecycle.
+ * @param socketTimeout Timeout in milliseconds for socket-level communication.
+ * @param httpLogger A logger used for HTTP logging (defaults to `Logger.DEFAULT`).
+ * @param httpLogLevel Level of HTTP logging (e.g. `LogLevel.ALL`).
+ * @param loggableHosts A list of hostnames for which HTTP logging is enabled.
+ * @param sensitiveHeaders List of headers to be hidden in logs (defaults to Authorization).
+ * @param jsonConfig Custom [Json] configuration used by `ContentNegotiation`.
+ * @param basicCredentialsProvider Provider for Basic authentication credentials.
+ * @param digestCredentialsProvider Provider for Digest authentication credentials.
+ * @param bearerTokensProvider Provider for Bearer token authentication.
+ * @param bearerRefreshProvider Optional refresh logic for Bearer tokens (only used if Bearer auth is configured).
+ *
+ * @return A configuration lambda to be passed into the Ktor [HttpClient].
+ */
+fun setupDefaultHttpClient(
+    baseUrl: String,
+    authRequiredUrl: List<String> = emptyList(),
+    defaultHeaders: Map<String, String> = emptyMap(),
+    requestTimeout: Long = 60_000L,
+    socketTimeout: Long = 60_000L,
+    httpLogger: Logger = Logger.DEFAULT,
+    httpLogLevel: LogLevel = LogLevel.ALL,
+    loggableHosts: List<String> = emptyList(),
+    sensitiveHeaders: List<String> = listOf(HttpHeaders.Authorization),
+    jsonConfig: Json = Json {
+        prettyPrint = true
+        isLenient = true
+        ignoreUnknownKeys = true
+        explicitNulls = false
+    },
+    basicCredentialsProvider: (() -> BasicAuthCredentials)? = null,
+    digestCredentialsProvider: (() -> DigestAuthCredentials)? = null,
+    bearerTokensProvider: (() -> BearerTokens)? = null,
+    bearerRefreshProvider: (() -> BearerTokens)? = null,
+): HttpClientConfig<*>.() -> Unit = {
+    when {
+        bearerTokensProvider != null -> {
+            install(Auth) {
+                bearer {
+                    loadTokens { bearerTokensProvider() }
+                    if (bearerRefreshProvider != null) {
+                        refreshTokens {
+                            bearerRefreshProvider()
+                        }
+                    }
+                    sendWithoutRequest { request ->
+                        request.url.host in authRequiredUrl
+                    }
+                }
+            }
+        }
+
+        basicCredentialsProvider != null -> {
+            install(Auth) {
+                basic {
+                    credentials {
+                        basicCredentialsProvider()
+                    }
+                    sendWithoutRequest { request ->
+                        request.url.host in authRequiredUrl
+                    }
+                }
+            }
+        }
+
+        digestCredentialsProvider != null -> {
+            install(Auth) {
+                digest {
+                    credentials {
+                        digestCredentialsProvider()
+                    }
+                }
+            }
+        }
+    }
+
+    defaultRequest {
+        url(baseUrl)
+        defaultHeaders.forEach { (key, value) ->
+            headers.append(key, value)
+        }
+    }
+
+    install(HttpTimeout) {
+        requestTimeoutMillis = requestTimeout
+        socketTimeoutMillis = socketTimeout
+    }
+
+    install(Logging) {
+        logger = httpLogger
+        level = httpLogLevel
+        filter { request ->
+            loggableHosts.any { host ->
+                request.url.host.contains(host)
+            }
+        }
+        sanitizeHeader { header ->
+            header in sensitiveHeaders
+        }
+        logger = object : Logger {
+            override fun log(message: String) {
+                KermitLogger.d(tag = "KtorClient", messageString = message)
+            }
+        }
+    }
+
+    install(ContentNegotiation) {
+        json(jsonConfig)
+    }
+}
diff --git a/core-base/network/src/commonMain/kotlin/template/core/base/network/NetworkError.kt b/core-base/network/src/commonMain/kotlin/template/core/base/network/NetworkError.kt
new file mode 100644
index 000000000..c8c4f52f1
--- /dev/null
+++ b/core-base/network/src/commonMain/kotlin/template/core/base/network/NetworkError.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network
+
+/**
+ * Represents standardized error types for remote or network operations.
+ *
+ * This enum is typically used with the [NetworkResult.Error] variant to describe what kind of failure occurred.
+ */
+enum class NetworkError {
+
+    /**
+     * The request was malformed or missing required parameters (HTTP 400).
+     */
+    BAD_REQUEST,
+
+    /**
+     * The requested resource could not be found (HTTP 404).
+     */
+    NOT_FOUND,
+
+    /**
+     * Authentication failed due to invalid or missing credentials (HTTP 401).
+     */
+    UNAUTHORIZED,
+
+    /**
+     * The request timed out, usually due to a slow or unresponsive network (HTTP 408 or socket timeout).
+     */
+    REQUEST_TIMEOUT,
+
+    /**
+     * The client has sent too many requests in a given amount of time (HTTP 429).
+     */
+    TOO_MANY_REQUESTS,
+
+    /**
+     * A server-side error occurred (HTTP 5xx).
+     */
+    SERVER,
+
+    /**
+     * The response could not be deserialized, likely due to mismatched or invalid data formats.
+     */
+    SERIALIZATION,
+
+    /**
+     * An unknown or unexpected error occurred, used as a fallback when the specific cause is not identifiable.
+     */
+    UNKNOWN,
+}
diff --git a/core-base/network/src/commonMain/kotlin/template/core/base/network/NetworkResult.kt b/core-base/network/src/commonMain/kotlin/template/core/base/network/NetworkResult.kt
new file mode 100644
index 000000000..abcf6845a
--- /dev/null
+++ b/core-base/network/src/commonMain/kotlin/template/core/base/network/NetworkResult.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network
+
+/**
+ * Represents the result of a network or remote operation, encapsulating either a success or an error.
+ *
+ * This is a sealed interface with two implementations:
+ * - [Success] indicates the operation completed successfully and contains the resulting data.
+ * - [Error] represents a failure and contains a [NetworkError] describing the error condition.
+ *
+ * @param D The type of data returned on success.
+ * @param E The type of error returned on failure, constrained to [NetworkError].
+ */
+sealed interface NetworkResult<out D, out E : NetworkError> {
+
+    /**
+     * Represents a successful result.
+     *
+     * @param D The type of the successful response data.
+     * @property data The actual result of the operation.
+     */
+    data class Success<out D>(val data: D) : NetworkResult<D, Nothing>
+
+    /**
+     * Represents a failed result due to a [NetworkError].
+     *
+     * @param E The specific type of [NetworkError] encountered.
+     * @property error Details about the error that occurred.
+     */
+    data class Error<out E : NetworkError>(val error: E) : NetworkResult<Nothing, E>
+}
diff --git a/core-base/network/src/commonMain/kotlin/template/core/base/network/factory/ResultSuspendConverterFactory.kt b/core-base/network/src/commonMain/kotlin/template/core/base/network/factory/ResultSuspendConverterFactory.kt
new file mode 100644
index 000000000..64f26cb87
--- /dev/null
+++ b/core-base/network/src/commonMain/kotlin/template/core/base/network/factory/ResultSuspendConverterFactory.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network.factory
+
+import de.jensklingenberg.ktorfit.Ktorfit
+import de.jensklingenberg.ktorfit.converter.Converter
+import de.jensklingenberg.ktorfit.converter.KtorfitResult
+import de.jensklingenberg.ktorfit.converter.TypeData
+import io.ktor.client.call.NoTransformationFoundException
+import io.ktor.client.call.body
+import io.ktor.client.statement.HttpResponse
+import kotlinx.serialization.SerializationException
+import template.core.base.network.NetworkError
+import template.core.base.network.NetworkResult
+
+/**
+ * A custom [Converter.Factory] for Ktorfit that provides a suspend
+ * response converter which wraps successful or error HTTP responses into a
+ * sealed [NetworkResult] type.
+ *
+ * This is useful for abstracting error handling logic across your network
+ * layer while providing strong typing for both success and failure
+ * outcomes.
+ *
+ * This converter handles:
+ * - HTTP 2xx responses by deserializing the response body into the
+ *   expected type.
+ * - Known HTTP error codes like 400, 401, 404, etc., by mapping them to
+ *   [NetworkError] types.
+ * - Deserialization issues via [SerializationException].
+ * - Unknown failures via [KtorfitResult.Failure].
+ *
+ * Example usage:
+ * ```kotlin
+ * interface ApiService {
+ *     @GET("users")
+ *     suspend fun getUsers(): Result<List<User>, RemoteError>
+ * }
+ * ```
+ */
+@Suppress("NestedBlockDepth")
+class ResultSuspendConverterFactory : Converter.Factory {
+
+    /**
+     * Creates a [Converter.SuspendResponseConverter] that wraps an HTTP
+     * response into a [NetworkResult] type.
+     *
+     * @param typeData Metadata about the expected response type.
+     * @param ktorfit The [Ktorfit] instance requesting this converter.
+     * @return A [Converter.SuspendResponseConverter] if the return type is
+     *    `Result`, or `null` otherwise.
+     */
+    override fun suspendResponseConverter(
+        typeData: TypeData,
+        ktorfit: Ktorfit,
+    ): Converter.SuspendResponseConverter<HttpResponse, *>? {
+        if (typeData.typeInfo.type == NetworkResult::class) {
+            val successType = typeData.typeArgs.first().typeInfo
+            return object :
+                Converter.SuspendResponseConverter<HttpResponse, NetworkResult<Any, NetworkError>> {
+
+                /**
+                 * Converts a [KtorfitResult] into a [NetworkResult], handling success and
+                 * various failure scenarios.
+                 *
+                 * @param result The response wrapped in [KtorfitResult].
+                 * @return A [NetworkResult.Success] if the response is successful, or a
+                 *    [NetworkResult.Error] if an error occurred.
+                 */
+                override suspend fun convert(result: KtorfitResult): NetworkResult<Any, NetworkError> {
+                    return when (result) {
+                        is KtorfitResult.Failure -> {
+                            println("Failure: " + result.throwable.message)
+                            NetworkResult.Error(NetworkError.UNKNOWN)
+                        }
+
+                        is KtorfitResult.Success -> {
+                            val status = result.response.status.value
+
+                            when (status) {
+                                in 200..209 -> {
+                                    try {
+                                        val data = result.response.body(successType) as Any
+                                        NetworkResult.Success(data)
+                                    } catch (e: NoTransformationFoundException) {
+                                        NetworkResult.Error(NetworkError.SERIALIZATION)
+                                    } catch (e: SerializationException) {
+                                        println("Serialization error: ${e.message}")
+                                        NetworkResult.Error(NetworkError.SERIALIZATION)
+                                    }
+                                }
+
+                                400 -> NetworkResult.Error(NetworkError.BAD_REQUEST)
+                                401 -> NetworkResult.Error(NetworkError.UNAUTHORIZED)
+                                404 -> NetworkResult.Error(NetworkError.NOT_FOUND)
+                                408 -> NetworkResult.Error(NetworkError.REQUEST_TIMEOUT)
+                                429 -> NetworkResult.Error(NetworkError.TOO_MANY_REQUESTS)
+                                in 500..599 -> NetworkResult.Error(NetworkError.SERVER)
+                                else -> {
+                                    println("Status code $status")
+                                    NetworkResult.Error(NetworkError.UNKNOWN)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return null
+    }
+}
diff --git a/core-base/network/src/desktopMain/kotlin/template/core/base/network/KtorHttpClient.desktop.kt b/core-base/network/src/desktopMain/kotlin/template/core/base/network/KtorHttpClient.desktop.kt
new file mode 100644
index 000000000..65edfc330
--- /dev/null
+++ b/core-base/network/src/desktopMain/kotlin/template/core/base/network/KtorHttpClient.desktop.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.okhttp.OkHttp
+
+actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(OkHttp) {
+    config(this)
+}
diff --git a/core-base/network/src/jsMain/kotlin/template/core/base/network/KtorHttpClient.js.kt b/core-base/network/src/jsMain/kotlin/template/core/base/network/KtorHttpClient.js.kt
new file mode 100644
index 000000000..beaa36ea3
--- /dev/null
+++ b/core-base/network/src/jsMain/kotlin/template/core/base/network/KtorHttpClient.js.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.js.Js
+
+actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Js) {
+    config(this)
+}
diff --git a/core-base/network/src/nativeMain/kotlin/template/core/base/network/KtorHttpClient.native.kt b/core-base/network/src/nativeMain/kotlin/template/core/base/network/KtorHttpClient.native.kt
new file mode 100644
index 000000000..3f6c9a4d4
--- /dev/null
+++ b/core-base/network/src/nativeMain/kotlin/template/core/base/network/KtorHttpClient.native.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.darwin.Darwin
+
+actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Darwin) {
+    config(this)
+}
diff --git a/core-base/network/src/wasmJsMain/kotlin/template/core/base/network/KtorHttpClient.wasmJs.kt b/core-base/network/src/wasmJsMain/kotlin/template/core/base/network/KtorHttpClient.wasmJs.kt
new file mode 100644
index 000000000..beaa36ea3
--- /dev/null
+++ b/core-base/network/src/wasmJsMain/kotlin/template/core/base/network/KtorHttpClient.wasmJs.kt
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
+ */
+package template.core.base.network
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.js.Js
+
+actual fun httpClient(config: HttpClientConfig<*>.() -> Unit) = HttpClient(Js) {
+    config(this)
+}
diff --git a/core-base/platform/build.gradle.kts b/core-base/platform/build.gradle.kts
index 54f02d6d3..b49cf6d7b 100644
--- a/core-base/platform/build.gradle.kts
+++ b/core-base/platform/build.gradle.kts
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 import org.gradle.kotlin.dsl.implementation
 
diff --git a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/LocalManagerProviders.android.kt b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/LocalManagerProviders.android.kt
index f634c52ea..5659bb404 100644
--- a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/LocalManagerProviders.android.kt
+++ b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/LocalManagerProviders.android.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform
 
diff --git a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/context/AppContext.android.kt b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/context/AppContext.android.kt
index 410abd97f..7c80cabff 100644
--- a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/context/AppContext.android.kt
+++ b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/context/AppContext.android.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.context
 
diff --git a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.android.kt b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.android.kt
index ac13801fc..8fd69b656 100644
--- a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.android.kt
+++ b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.android.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.garbage
 
diff --git a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/intent/IntentManagerImpl.kt b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/intent/IntentManagerImpl.kt
index 221df75dd..e3f04b245 100644
--- a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/intent/IntentManagerImpl.kt
+++ b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/intent/IntentManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.intent
 
diff --git a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/review/AppReviewManagerImpl.kt b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/review/AppReviewManagerImpl.kt
index 765fba1b4..40d0e277e 100644
--- a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/review/AppReviewManagerImpl.kt
+++ b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/review/AppReviewManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.review
 
diff --git a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/update/AppUpdateManagerImpl.kt b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/update/AppUpdateManagerImpl.kt
index eb35664dd..f78a49408 100644
--- a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/update/AppUpdateManagerImpl.kt
+++ b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/update/AppUpdateManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.update
 
diff --git a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/utils/AndroidBuildUtils.kt b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/utils/AndroidBuildUtils.kt
index a73fbe724..fdd9a9f3d 100644
--- a/core-base/platform/src/androidMain/kotlin/template/core/base/platform/utils/AndroidBuildUtils.kt
+++ b/core-base/platform/src/androidMain/kotlin/template/core/base/platform/utils/AndroidBuildUtils.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.utils
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/LocalManagerProviders.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/LocalManagerProviders.kt
index 7ada5dec2..4a78fdce6 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/LocalManagerProviders.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/LocalManagerProviders.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/context/AppContext.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/context/AppContext.kt
index 7fbfcc212..cdcd49f8e 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/context/AppContext.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/context/AppContext.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.context
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/di/PlatformModule.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/di/PlatformModule.kt
index 4dc1ba195..35db29eda 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/di/PlatformModule.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/di/PlatformModule.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.di
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.kt
index 6808ff5fe..961d451fd 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.garbage
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManagerImpl.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManagerImpl.kt
index 325d82bc0..73ba12312 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManagerImpl.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.garbage
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/intent/IntentManager.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/intent/IntentManager.kt
index a7db4c69d..034fb6c9f 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/intent/IntentManager.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/intent/IntentManager.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.intent
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/model/MimeType.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/model/MimeType.kt
index 25970acde..f0340940e 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/model/MimeType.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/model/MimeType.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.model
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/review/AppReviewManager.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/review/AppReviewManager.kt
index b3c4155d1..0d6e8de4e 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/review/AppReviewManager.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/review/AppReviewManager.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.review
 
diff --git a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/update/AppUpdateManager.kt b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/update/AppUpdateManager.kt
index 287d8d97c..623381e4b 100644
--- a/core-base/platform/src/commonMain/kotlin/template/core/base/platform/update/AppUpdateManager.kt
+++ b/core-base/platform/src/commonMain/kotlin/template/core/base/platform/update/AppUpdateManager.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.update
 
diff --git a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/LocalManagerProviders.native.kt b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/LocalManagerProviders.native.kt
index e2b4cd54f..b824fbc86 100644
--- a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/LocalManagerProviders.native.kt
+++ b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/LocalManagerProviders.native.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform
 
diff --git a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/context/AppContext.native.kt b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/context/AppContext.native.kt
index 9da7ff9a3..f578dcb25 100644
--- a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/context/AppContext.native.kt
+++ b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/context/AppContext.native.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.context
 
diff --git a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.nonAndroid.kt b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.nonAndroid.kt
index 5250cc98b..2be8bc385 100644
--- a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.nonAndroid.kt
+++ b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/garbage/GarbageCollectionManager.nonAndroid.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.garbage
 
diff --git a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/intent/IntentManagerImpl.kt b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/intent/IntentManagerImpl.kt
index c9f9c0210..c7da0f592 100644
--- a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/intent/IntentManagerImpl.kt
+++ b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/intent/IntentManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.intent
 
diff --git a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/review/AppReviewManagerImpl.kt b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/review/AppReviewManagerImpl.kt
index d4c1d7be5..1a3f6d7d2 100644
--- a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/review/AppReviewManagerImpl.kt
+++ b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/review/AppReviewManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.review
 
diff --git a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/update/AppUpdateManagerImpl.kt b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/update/AppUpdateManagerImpl.kt
index c22f52ac4..eb4fc2731 100644
--- a/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/update/AppUpdateManagerImpl.kt
+++ b/core-base/platform/src/nonAndroidMain/kotlin/template/core/base/platform/update/AppUpdateManagerImpl.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.platform.update
 
diff --git a/core-base/ui/README.md b/core-base/ui/README.md
index eec63d023..91ec552b5 100644
--- a/core-base/ui/README.md
+++ b/core-base/ui/README.md
@@ -381,29 +381,6 @@ internal fun rememberDefaultImageLoader(context: PlatformContext): ImageLoader {
 The `maxSizePercent` call is crucial—it adapts the cache size to the device's available memory,
 ensuring efficient resource usage across a wide range of devices.
 
-### Request Optimization
-
-The image request builder includes memory cache optimization:
-
-```kotlin
-@Composable
-fun rememberImageRequest(
-    context: PlatformContext,
-    wallpaper: String,
-): ImageRequest {
-    return remember(wallpaper) {
-        ImageRequest.Builder(context)
-            .data(wallpaper)
-            .memoryCacheKey(wallpaper)
-            .placeholderMemoryCacheKey(wallpaper)
-            .build()
-    }
-}
-```
-
-The use of `memoryCacheKey` and `placeholderMemoryCacheKey` ensures that images with the same URL
-share the same cache entry, reducing memory usage and improving load times.
-
 ### Common Use Patterns
 
 For profile pictures and avatars:
@@ -411,8 +388,7 @@ For profile pictures and avatars:
 ```kotlin
 @Composable
 fun CircularProfileImage(url: String, size: Dp = 48.dp) {
-    val context = LocalPlatformContext.current
-    val imageLoader = rememberImageLoader(context)
+    val imageLoader = rememberImageLoader()
 
     AsyncImage(
         model = rememberImageRequest(context, url),
@@ -434,8 +410,7 @@ For background images:
 ```kotlin
 @Composable
 fun BackgroundImage(url: String, overlay: Color = Color.Black.copy(alpha = 0.3f)) {
-    val context = LocalPlatformContext.current
-    val imageLoader = rememberImageLoader(context)
+    val imageLoader = rememberImageLoader()
 
     Box {
         AsyncImage(
diff --git a/core-base/ui/build.gradle.kts b/core-base/ui/build.gradle.kts
index 12e071548..4ada49284 100644
--- a/core-base/ui/build.gradle.kts
+++ b/core-base/ui/build.gradle.kts
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
diff --git a/core-base/ui/src/androidMain/kotlin/template/core/base/ui/JankStatsExtensions.kt b/core-base/ui/src/androidMain/kotlin/template/core/base/ui/JankStatsExtensions.kt
index 9da46f17b..7a6782398 100644
--- a/core-base/ui/src/androidMain/kotlin/template/core/base/ui/JankStatsExtensions.kt
+++ b/core-base/ui/src/androidMain/kotlin/template/core/base/ui/JankStatsExtensions.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/androidMain/kotlin/template/core/base/ui/ReportDrawnExt.android.kt b/core-base/ui/src/androidMain/kotlin/template/core/base/ui/ReportDrawnExt.android.kt
index 45578737c..de004552f 100644
--- a/core-base/ui/src/androidMain/kotlin/template/core/base/ui/ReportDrawnExt.android.kt
+++ b/core-base/ui/src/androidMain/kotlin/template/core/base/ui/ReportDrawnExt.android.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/androidMain/kotlin/template/core/base/ui/ShareUtils.android.kt b/core-base/ui/src/androidMain/kotlin/template/core/base/ui/ShareUtils.android.kt
index a792cbe28..b97a13dca 100644
--- a/core-base/ui/src/androidMain/kotlin/template/core/base/ui/ShareUtils.android.kt
+++ b/core-base/ui/src/androidMain/kotlin/template/core/base/ui/ShareUtils.android.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
@@ -14,10 +14,12 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.net.Uri
+import android.provider.Settings
 import android.util.Log
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.jetbrains.compose.resources.ExperimentalResourceApi
@@ -102,4 +104,71 @@ actual object ShareUtils {
             }
         }
     }
+
+    actual fun openUrl(url: String) {
+        val context = ShareUtils.activityProvider.invoke().application.baseContext
+        val uri = url.let { url.toUri() }
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            data = uri
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivity(intent)
+    }
+
+    actual fun openAppInfo() {
+        val context = activityProvider.invoke().application.baseContext
+        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+            data = Uri.parse("package:${context.packageName}")
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivity(intent)
+    }
+
+    actual fun callPhone(number: String) {
+        val context = activityProvider.invoke().application.baseContext
+        val uri = Uri.parse("tel:$number")
+        val intent = Intent(Intent.ACTION_DIAL).apply {
+            data = uri
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivity(intent)
+    }
+
+    actual fun sendEmail(to: String, subject: String?, body: String?) {
+        val context = activityProvider.invoke().application.baseContext
+        val uriBuilder = StringBuilder("mailto:").append(to)
+        val query = mutableListOf<String>()
+        subject?.let { query.add("subject=" + Uri.encode(it)) }
+        body?.let { query.add("body=" + Uri.encode(it)) }
+        if (query.isNotEmpty()) {
+            uriBuilder.append("?").append(query.joinToString("&"))
+        }
+        val intent = Intent(Intent.ACTION_SENDTO).apply {
+            data = Uri.parse(uriBuilder.toString())
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivity(intent)
+    }
+
+    actual fun sendViaSMS(number: String, message: String) {
+        val context = activityProvider.invoke().application.baseContext
+        val uri = if (number.isNotEmpty()) {
+            Uri.parse("sms:$number")
+        } else {
+            Uri.parse("sms:")
+        }
+        val intent = Intent(Intent.ACTION_SENDTO).apply {
+            data = uri
+            putExtra("sms_body", message)
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        context.startActivity(intent)
+    }
+
+    actual fun copyText(text: String) {
+        val context = activityProvider.invoke().application.baseContext
+        val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
+        val clip = android.content.ClipData.newPlainText("Copied Text", text)
+        clipboardManager.setPrimaryClip(clip)
+    }
 }
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/BackgroundEvent.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/BackgroundEvent.kt
index 914d1a3c2..5a54d833e 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/BackgroundEvent.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/BackgroundEvent.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/BaseViewModel.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/BaseViewModel.kt
index 3a72463d0..2b4b8550a 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/BaseViewModel.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/BaseViewModel.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/EventsEffect.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/EventsEffect.kt
index 46457b3bf..0a460c029 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/EventsEffect.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/EventsEffect.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ImageLoaderExt.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ImageLoaderExt.kt
index 4151e6d81..e5b5d40c6 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ImageLoaderExt.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ImageLoaderExt.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
@@ -15,78 +15,60 @@ import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.remember
 import coil3.ImageLoader
 import coil3.PlatformContext
+import coil3.compose.LocalPlatformContext
 import coil3.memory.MemoryCache
-import coil3.request.ImageRequest
+import coil3.request.CachePolicy
 import coil3.util.DebugLogger
 import io.github.vinceglb.filekit.coil.addPlatformFileSupport
 
 /**
- * CompositionLocal that provides access to an [ImageLoader] within the composition hierarchy.
- * Default value is null, requiring an explicit provider or fallback to default implementation.
- */
-internal val LocalAppImageLoader = compositionLocalOf<ImageLoader?> { null }
-
-/**
- * Returns an [ImageLoader] from the current composition or creates a default one if none is available.
+ * A CompositionLocal instance used to provide a shared [ImageLoader] across the composable hierarchy.
+ * This is useful for performing image loading and caching within Jetpack Compose UIs.
  *
- * @param context Platform context required for image loading
- * @return An [ImageLoader] instance that can be used for image loading operations
+ * If no [ImageLoader] is provided within the context, an error will be thrown when accessing this CompositionLocal.
  */
-@Composable
-fun rememberImageLoader(context: PlatformContext): ImageLoader {
-    return LocalAppImageLoader.current ?: rememberDefaultImageLoader(context)
+internal val LocalAppImageLoader = compositionLocalOf<ImageLoader> {
+    error("No ImageLoader provided. Have you forgotten the LocalImageLoaderProvider?")
 }
 
 /**
- * Creates and remembers a default [ImageLoader] with memory cache and debug logging.
+ * Creates and remembers an instance of the default ImageLoader configured with platform-specific
+ * settings for caching and logging. The ImageLoader is initialized using the current platform context.
  *
- * @param context Platform context required for image loading and memory calculations
- * @return A default configured [ImageLoader] instance
+ * @return A remembered instance of the default ImageLoader configured with common settings.
  */
 @Composable
-internal fun rememberDefaultImageLoader(context: PlatformContext): ImageLoader {
-    return remember(context) {
-        ImageLoader.Builder(context)
-            .memoryCache {
-                MemoryCache.Builder()
-                    .maxSizePercent(context, 0.25)
-                    .build()
-            }
-            .logger(DebugLogger())
-            .components {
-                addPlatformFileSupport()
-            }
+fun rememberImageLoader(): ImageLoader {
+    val context = LocalPlatformContext.current
+    return remember(context) { getDefaultImageLoader(context) }
+}
+
+/**
+ * Creates and returns a default instance of an ImageLoader configured with common settings such as
+ * logging, caching policies, memory caching, and platform-specific component support.
+ *
+ * @param context The platform-specific context required to initialize the ImageLoader
+ * @return A configured ImageLoader instance ready for use
+ */
+fun getDefaultImageLoader(context: PlatformContext): ImageLoader = ImageLoader
+    .Builder(context)
+    .logger(DebugLogger())
+    .networkCachePolicy(CachePolicy.ENABLED)
+    .memoryCachePolicy(CachePolicy.ENABLED)
+    .memoryCache {
+        MemoryCache.Builder()
+            .maxSizePercent(context, 0.25)
             .build()
     }
-}
+    .components {
+        addPlatformFileSupport()
+    }.build()
 
 /**
- * Creates and remembers an [ImageRequest] for loading the specified wallpaper.
+ * Provides a composable local context for an `ImageLoader` to be used within a Composable hierarchy.
  *
- * @param context Platform context required for the image request
- * @param wallpaper String identifier for the wallpaper to be loaded
- * @return An [ImageRequest] configured for the specified wallpaper
- */
-@Composable
-fun rememberImageRequest(
-    context: PlatformContext,
-    wallpaper: String,
-): ImageRequest {
-    return remember(wallpaper) {
-        ImageRequest.Builder(context)
-            .data(wallpaper)
-            .memoryCacheKey(wallpaper)
-            .placeholderMemoryCacheKey(wallpaper)
-            .build()
-    }
-}
-
-/**
- * Provides the specified [ImageLoader] to all composables within the [content] lambda
- * via [CompositionLocalProvider].
- *
- * @param imageLoader The [ImageLoader] to provide downstream
- * @param content The composable content that will have access to the provided [ImageLoader]
+ * @param imageLoader The `ImageLoader` instance to be provided to the local composition.
+ * @param content A composable lambda function representing the UI content that can access the provided `ImageLoader`.
  */
 @Composable
 fun LocalImageLoaderProvider(imageLoader: ImageLoader, content: @Composable () -> Unit) {
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/JankStatsExtension.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/JankStatsExtension.kt
index 72b712f1b..aed073cfe 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/JankStatsExtension.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/JankStatsExtension.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/LifecycleEventEffect.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/LifecycleEventEffect.kt
index e59267fde..142019344 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/LifecycleEventEffect.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/LifecycleEventEffect.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/NavGraphBuilderExtensions.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/NavGraphBuilderExtensions.kt
index 609eb0dcb..0b69a46a6 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/NavGraphBuilderExtensions.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/NavGraphBuilderExtensions.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ReportDrawnExt.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ReportDrawnExt.kt
index d83a37ae9..a51c76d51 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ReportDrawnExt.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ReportDrawnExt.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ShareUtils.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ShareUtils.kt
index fe22188fb..105f7654e 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ShareUtils.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/ShareUtils.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
@@ -39,4 +39,50 @@ expect object ShareUtils {
      * @param byte The raw image data as ByteArray
      */
     suspend fun shareImage(title: String, byte: ByteArray)
+
+    /**
+     * Opens the specified URL in the device's default web browser.
+     *
+     * @param url The URL to open.
+     */
+    fun openUrl(url: String)
+
+    /**
+     * Opens the application info screen in the device settings.
+     *
+     * Typically used to allow users to manage app permissions,
+     * storage, or other app-specific settings.
+     */
+    fun openAppInfo()
+
+    /**
+     * Initiates a phone call using the platform dialer UI.
+     *
+     * @param number The phone number to dial, digits only or including country code.
+     */
+    fun callPhone(number: String)
+
+    /**
+     * Opens the platform email composer with the given parameters.
+     *
+     * @param to Recipient email address
+     * @param subject Optional subject line
+     * @param body Optional email body
+     */
+    fun sendEmail(to: String, subject: String? = null, body: String? = null)
+
+    /**
+     * Opens the platform SMS composer with the given parameters.
+     *
+     * @param number Recipient phone number (can be empty to let user choose)
+     * @param message The SMS message body
+     */
+    fun sendViaSMS(number: String, message: String)
+
+    /**
+     * Copies the given text to the system clipboard.
+     *
+     * @param text The text to copy to clipboard
+     */
+    fun copyText(text: String)
 }
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/SharedElementExt.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/SharedElementExt.kt
index 440124c9b..f0ec8aa82 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/SharedElementExt.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/SharedElementExt.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 @file:OptIn(ExperimentalSharedTransitionApi::class)
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/StringExt.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/StringExt.kt
index 6b7455463..bc0f0bc11 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/StringExt.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/StringExt.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/Transition.kt b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/Transition.kt
index 63de01f91..875ef5716 100644
--- a/core-base/ui/src/commonMain/kotlin/template/core/base/ui/Transition.kt
+++ b/core-base/ui/src/commonMain/kotlin/template/core/base/ui/Transition.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/desktopMain/java/template/core/base/ui/ShareUtils.desktop.kt b/core-base/ui/src/desktopMain/java/template/core/base/ui/ShareUtils.desktop.kt
index c7233d7d1..d227c0871 100644
--- a/core-base/ui/src/desktopMain/java/template/core/base/ui/ShareUtils.desktop.kt
+++ b/core-base/ui/src/desktopMain/java/template/core/base/ui/ShareUtils.desktop.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
@@ -13,6 +13,8 @@ import androidx.compose.ui.graphics.asSkiaBitmap
 import io.github.vinceglb.filekit.FileKit
 import io.github.vinceglb.filekit.saveImageToGallery
 import kotlinx.coroutines.DelicateCoroutinesApi
+import java.awt.Desktop
+import java.net.URI
 
 actual object ShareUtils {
     @OptIn(DelicateCoroutinesApi::class)
@@ -41,4 +43,69 @@ actual object ShareUtils {
             filename = "$title.png",
         )
     }
+
+    actual fun openUrl(url: String) {
+        try {
+            if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                Desktop.getDesktop().browse(URI(url))
+            }
+        } catch (e: Exception) {
+            println("Error opening URL: ${e.message}")
+        }
+    }
+
+    actual fun openAppInfo() {
+        // Not applicable on Desktop; no-op
+    }
+
+    actual fun callPhone(number: String) {
+        try {
+            if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                Desktop.getDesktop().browse(URI("tel:$number"))
+            }
+        } catch (e: Exception) {
+            println("Error opening dialer: ${e.message}")
+        }
+    }
+
+    actual fun sendEmail(to: String, subject: String?, body: String?) {
+        val q = mutableListOf<String>()
+        subject?.let { q.add("subject=" + java.net.URLEncoder.encode(it, Charsets.UTF_8)) }
+        body?.let { q.add("body=" + java.net.URLEncoder.encode(it, Charsets.UTF_8)) }
+        val query = if (q.isNotEmpty()) "?" + q.joinToString("&") else ""
+        val mailto = "mailto:$to$query"
+        try {
+            if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                Desktop.getDesktop().browse(URI(mailto))
+            }
+        } catch (e: Exception) {
+            println("Error opening email client: ${e.message}")
+        }
+    }
+
+    actual fun sendViaSMS(number: String, message: String) {
+        val encodedMessage = java.net.URLEncoder.encode(message, Charsets.UTF_8)
+        val smsUrl = if (number.isNotEmpty()) {
+            "sms:$number?body=$encodedMessage"
+        } else {
+            "sms:?body=$encodedMessage"
+        }
+        try {
+            if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+                Desktop.getDesktop().browse(URI(smsUrl))
+            }
+        } catch (e: Exception) {
+            println("Error opening SMS: ${e.message}")
+        }
+    }
+
+    actual fun copyText(text: String) {
+        try {
+            val clipboard = java.awt.Toolkit.getDefaultToolkit().systemClipboard
+            val stringSelection = java.awt.datatransfer.StringSelection(text)
+            clipboard.setContents(stringSelection, null)
+        } catch (e: Exception) {
+            println("Error copying to clipboard: ${e.message}")
+        }
+    }
 }
diff --git a/core-base/ui/src/jsCommonMain/kotlin/template/core/base/ui/ShareUtils.kt b/core-base/ui/src/jsCommonMain/kotlin/template/core/base/ui/ShareUtils.kt
index 06d39f423..7884921e2 100644
--- a/core-base/ui/src/jsCommonMain/kotlin/template/core/base/ui/ShareUtils.kt
+++ b/core-base/ui/src/jsCommonMain/kotlin/template/core/base/ui/ShareUtils.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
@@ -42,4 +42,22 @@ actual object ShareUtils {
             fileName = "$title.png",
         )
     }
+
+    actual fun openUrl(url: String) {
+    }
+
+    actual fun openAppInfo() {
+    }
+
+    actual fun callPhone(number: String) {
+    }
+
+    actual fun sendEmail(to: String, subject: String?, body: String?) {
+    }
+
+    actual fun sendViaSMS(number: String, message: String) {
+    }
+
+    actual fun copyText(text: String) {
+    }
 }
diff --git a/core-base/ui/src/nativeMain/kotlin/template/core/base/ui/ShareUtils.native.kt b/core-base/ui/src/nativeMain/kotlin/template/core/base/ui/ShareUtils.native.kt
index 585756f22..e554b3b01 100644
--- a/core-base/ui/src/nativeMain/kotlin/template/core/base/ui/ShareUtils.native.kt
+++ b/core-base/ui/src/nativeMain/kotlin/template/core/base/ui/ShareUtils.native.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
@@ -13,8 +13,10 @@ import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asSkiaBitmap
 import io.github.vinceglb.filekit.FileKit
 import io.github.vinceglb.filekit.saveImageToGallery
+import platform.Foundation.NSURL
 import platform.UIKit.UIActivityViewController
 import platform.UIKit.UIApplication
+import platform.UIKit.UIApplicationOpenSettingsURLString
 
 actual object ShareUtils {
     actual suspend fun shareText(text: String) {
@@ -42,4 +44,58 @@ actual object ShareUtils {
             filename = "$title.png",
         )
     }
+
+    actual fun openUrl(url: String) {
+        val nsUrl = NSURL.URLWithString(url)
+        if (nsUrl != null) {
+            UIApplication.sharedApplication.openURL(nsUrl)
+        }
+    }
+
+    actual fun openAppInfo() {
+        val url = NSURL.URLWithString(UIApplicationOpenSettingsURLString)
+        if (url != null && UIApplication.sharedApplication.canOpenURL(url)) {
+            UIApplication.sharedApplication.openURL(url)
+        }
+    }
+
+    actual fun callPhone(number: String) {
+        val url = NSURL.URLWithString("tel:$number")
+        if (url != null && UIApplication.sharedApplication.canOpenURL(url)) {
+            UIApplication.sharedApplication.openURL(url)
+        }
+    }
+
+    actual fun sendEmail(to: String, subject: String?, body: String?) {
+        fun encode(s: String): String = s.replace(" ", "%20").replace("\n", "%0A")
+        val encodedSubject = subject?.let { encode(it) } ?: ""
+        val encodedBody = body?.let { encode(it) } ?: ""
+        val query = buildList {
+            if (encodedSubject.isNotEmpty()) add("subject=$encodedSubject")
+            if (encodedBody.isNotEmpty()) add("body=$encodedBody")
+        }.joinToString("&")
+        val mailto = if (query.isNotEmpty()) "mailto:$to?$query" else "mailto:$to"
+        val url = NSURL.URLWithString(mailto)
+        if (url != null && UIApplication.sharedApplication.canOpenURL(url)) {
+            UIApplication.sharedApplication.openURL(url)
+        }
+    }
+
+    actual fun sendViaSMS(number: String, message: String) {
+        fun encode(s: String): String = s.replace(" ", "%20").replace("\n", "%0A")
+        val encodedMessage = encode(message)
+        val smsUrl = if (number.isNotEmpty()) {
+            "sms:$number&body=$encodedMessage"
+        } else {
+            "sms:&body=$encodedMessage"
+        }
+        val url = NSURL.URLWithString(smsUrl)
+        if (url != null && UIApplication.sharedApplication.canOpenURL(url)) {
+            UIApplication.sharedApplication.openURL(url)
+        }
+    }
+
+    actual fun copyText(text: String) {
+        platform.UIKit.UIPasteboard.generalPasteboard.string = text
+    }
 }
diff --git a/core-base/ui/src/nonAndroidMain/kotlin/template/core/base/ui/JankStatsExtension.jvmJs.kt b/core-base/ui/src/nonAndroidMain/kotlin/template/core/base/ui/JankStatsExtension.jvmJs.kt
index 79fac842a..6cb9e5877 100644
--- a/core-base/ui/src/nonAndroidMain/kotlin/template/core/base/ui/JankStatsExtension.jvmJs.kt
+++ b/core-base/ui/src/nonAndroidMain/kotlin/template/core/base/ui/JankStatsExtension.jvmJs.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/core-base/ui/src/nonAndroidMain/kotlin/template/core/base/ui/ReportDrawnExt.jvmJs.kt b/core-base/ui/src/nonAndroidMain/kotlin/template/core/base/ui/ReportDrawnExt.jvmJs.kt
index ef719f589..27ee6131e 100644
--- a/core-base/ui/src/nonAndroidMain/kotlin/template/core/base/ui/ReportDrawnExt.jvmJs.kt
+++ b/core-base/ui/src/nonAndroidMain/kotlin/template/core/base/ui/ReportDrawnExt.jvmJs.kt
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  *
- * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ * See See https://github.com/openMF/kmp-project-template/blob/main/LICENSE
  */
 package template.core.base.ui
 
diff --git a/fastlane/AppFile b/fastlane/AppFile
index 76cfee016..a355ac5ab 100644
--- a/fastlane/AppFile
+++ b/fastlane/AppFile
@@ -1,2 +1,12 @@
-json_key_file("cmp-android/playStorePublishServiceCredentialsFile.json")
-package_name("org.mifos.mobile") # e.g. org.mifos.mobile
\ No newline at end of file
+# Load project configuration using absolute path
+# require_relative doesn't work in AppFile due to eval context
+project_dir = File.expand_path('..', __dir__)
+require File.join(project_dir, 'fastlane-config', 'project_config')
+
+# Android configuration
+json_key_file(FastlaneConfig::ProjectConfig::ANDROID[:play_store_json_key])
+package_name(FastlaneConfig::ProjectConfig.android_package_name)
+
+# iOS configuration  
+apple_id(FastlaneConfig::ProjectConfig::IOS[:app_identifier])
+team_id(FastlaneConfig::ProjectConfig::IOS[:team_id])
diff --git a/fastlane/FastFile b/fastlane/FastFile
index 929a49001..06362dec5 100644
--- a/fastlane/FastFile
+++ b/fastlane/FastFile
@@ -36,7 +36,7 @@ platform :android do
     generateVersion = generateVersion()
 
     buildAndSignApp(
-      taskName: "bundle",
+      taskName: "assemble",
       buildType: "Release",
       **signing_config
     )
@@ -324,80 +324,60 @@ platform :ios do
   # Shared Private Lane Helpers
   #############################
 
-  private_lane :setup_ci_if_needed do
-    unless ENV['CI']
-      UI.message("🖥️ Running locally, skipping CI-specific setup.")
-    else
-      setup_ci
-    end
+  private_lane :setup_ci_if_needed do |options|
+      unless ENV['CI']
+          UI.message("🖥️ Running locally, skipping CI-specific setup.")
+      else
+          ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
+          setup_ci(
+            provider: options[:ci_provider] || ios_config[:ci_provider]
+          )
+      end
   end
 
   private_lane :load_api_key do |options|
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
+      ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
 
-    app_store_connect_api_key(
-      key_id: options[:appstore_key_id] || ios_config[:key_id],
-      issuer_id: options[:appstore_issuer_id] || ios_config[:issuer_id],
-      key_filepath: options[:key_filepath] || ios_config[:key_filepath],
-      duration: 1200
-    )
+      app_store_connect_api_key(
+        key_id: options[:appstore_key_id] || ios_config[:key_id],
+        issuer_id: options[:appstore_issuer_id] || ios_config[:issuer_id],
+        key_filepath: options[:key_filepath] || ios_config[:key_filepath],
+        duration: 1200
+      )
   end
 
   private_lane :fetch_certificates_with_match do |options|
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
-    match(
-      type: options[:match_type] || ios_config[:match_type],
-      app_identifier: options[:app_identifier] || ios_config[:app_identifier],
-      readonly: true,
-      git_url: options[:git_url] || ios_config[:git_url],
-      git_branch: options[:git_branch] || ios_config[:git_branch],
-      git_private_key: options[:git_private_key] || ios_config[:match_git_private_key],
-      force_for_new_devices: true,
-      api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
-    )
+      ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
+      match(
+        type: options[:match_type] || ios_config[:match_type],
+        app_identifier: options[:app_identifier] || ios_config[:app_identifier],
+        readonly: false,
+        git_url: options[:git_url] || ios_config[:git_url],
+        git_branch: options[:git_branch] || ios_config[:git_branch],
+        git_private_key: options[:git_private_key] || ios_config[:match_git_private_key],
+        force_for_new_devices: true,
+        api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+      )
   end
 
   private_lane :build_ios_project do |options|
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
-    app_identifier = options[:app_identifier] || ios_config[:app_identifier]
-    provisioning_profile_name = options[:provisioning_profile_name] || ios_config[:provisioning_profile_name]
+      ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
+      app_identifier = options[:app_identifier] || ios_config[:app_identifier]
+      provisioning_profile_name = options[:provisioning_profile_name] || ios_config[:provisioning_profile_name]
+      team_id = options[:team_id] || ios_config[:team_id]
 
-    cocoapods(
-      podfile: ios_config[:podfile_path],
-      clean_install: true,
-      repo_update: true
-    )
-
-    # Manual signing for your main app target
-    update_code_signing_settings(
-      use_automatic_signing: false,
-      path: ios_config[:project_path],
-      targets: [ios_config[:target]],
-      team_id: ios_config[:team_id],
-      code_sign_identity: ios_config[:code_sign_identity],
-      profile_name: provisioning_profile_name,
-      bundle_identifier: app_identifier
-    )
-
-    build_ios_app(
-      scheme: ios_config[:scheme],
-      workspace: ios_config[:workspace_path],
-      output_name: ios_config[:output_name],
-      output_directory: ios_config[:output_directory],
-      configuration: ios_config[:configuration]
-    )
-  end
-
-  private_lane :set_plist_values do
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
-    update_plist(
-      plist_path: ios_config[:plist_path],
-      block: proc do |plist|
-        plist["ITSAppUsesNonExemptEncryption"] = false
-        plist["NSCameraUsageDescription"] = "We use the camera to scan QR codes for payments and to add beneficiaries. No images or video are stored."
-        plist["NSPhotoLibraryUsageDescription"] = "Allow access to choose a photo or document you decide to upload (e.g., profile photo or ID)."
-      end
-    )
+      build_ios_app(
+        scheme: ios_config[:scheme],
+        workspace: ios_config[:workspace_path],
+        output_name: ios_config[:output_name],
+        output_directory: ios_config[:output_directory],
+        export_options: {
+            provisioningProfiles: {
+                app_identifier => provisioning_profile_name
+            }
+        },
+        xcargs: "CODE_SIGN_STYLE=Manual CODE_SIGN_IDENTITY=\"Apple Distribution\" DEVELOPMENT_TEAM=#{team_id} PROVISIONING_PROFILE_SPECIFIER=\"#{provisioning_profile_name}\""
+      )
   end
 
   ###################
@@ -406,30 +386,23 @@ platform :ios do
 
   desc "Build Ios application"
   lane :build_ios do |options|
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
-
-    cocoapods(
-      podfile: ios_config[:podfile_path],
-      clean_install: true,
-      repo_update: true
-    )
-
-    build_ios_app(
-      scheme: ios_config[:scheme],
-      workspace: ios_config[:workspace_path],
-      output_name: ios_config[:output_name],
-      output_directory: ios_config[:output_directory],
-      skip_codesigning: true,
-      skip_archive: true
-    )
+      ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
+      build_ios_app(
+          scheme: ios_config[:scheme],
+          workspace: ios_config[:workspace_path],
+          output_name: ios_config[:output_name],
+          output_directory: ios_config[:output_directory],
+          skip_codesigning: true,
+          skip_archive: true
+      )
   end
 
   desc "Build Signed Ios application"
   lane :build_signed_ios do |options|
-    setup_ci_if_needed
-    load_api_key(options)
-    fetch_certificates_with_match(options)
-    build_ios_project(options)
+      setup_ci_if_needed
+      load_api_key(options)
+      fetch_certificates_with_match(options)
+      build_ios_project(options)
   end
 
   desc "Increment build number from latest Firebase release"
@@ -464,14 +437,15 @@ platform :ios do
   desc "Upload iOS application to Firebase App Distribution"
   lane :deploy_on_firebase do |options|
     firebase_config = FastlaneConfig.get_firebase_config(:ios)
+    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
 
     increment_version(serviceCredsFile: firebase_config[:serviceCredsFile])
 
     build_signed_ios(
-      options.merge(
-        match_type: "adhoc",
-        provisioning_profile_name: "match AdHoc org.mifos.mobile"
-      )
+        options.merge(
+            match_type: ios_config[:match_type],
+            provisioning_profile_name: ios_config[:provisioning_profile_name]
+        )
     )
 
     releaseNotes = generateReleaseNote()
@@ -487,238 +461,111 @@ platform :ios do
   desc "Upload beta build to TestFlight"
   lane :beta do |options|
 
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
+      ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
 
-    setup_ci_if_needed
-    load_api_key(options)
-    fetch_certificates_with_match(
-      options.merge(match_type: "appstore")
-    )
-
-    increment_version_number(
-      xcodeproj: ios_config[:project_path],
-      version_number: ios_config[:version_number]
-    )
-
-    latest_build_number = latest_testflight_build_number(
-      app_identifier: options[:app_identifier] || ios_config[:app_identifier],
-      api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
-      version: ios_config[:version_number]
-    )
-
-    increment_build_number(
-      xcodeproj: ios_config[:project_path],
-      build_number: latest_build_number + 1
-    )
-
-    set_plist_values
-
-    build_ios_project(
-      options.merge(
-        provisioning_profile_name: "match AppStore org.mifos.mobile"
+      setup_ci_if_needed
+      load_api_key(options)
+      fetch_certificates_with_match(
+        options.merge(match_type: "appstore")
       )
-    )
 
-    pilot(
-      api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
-      skip_waiting_for_build_processing: true
-    )
+      increment_version_number(
+        xcodeproj: ios_config[:project_path],
+        version_number: ios_config[:version_number]
+      )
+
+      latest_build_number = latest_testflight_build_number(
+        app_identifier: options[:app_identifier] || ios_config[:app_identifier],
+        api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+      )
+
+      increment_build_number(
+        xcodeproj: ios_config[:project_path],
+        build_number: latest_build_number + 1
+      )
+
+      build_ios_project(
+        options.merge(
+            provisioning_profile_name: ios_config[:provisioning_profile_appstore]
+        )
+      )
+
+      pilot(
+        api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
+        skip_waiting_for_build_processing: true
+      )
   end
 
   desc "Upload iOS Application to AppStore"
   lane :release do |options|
 
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
+     ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
 
-    setup_ci_if_needed
-    load_api_key(options)
-    fetch_certificates_with_match(
-      options.merge(match_type: "appstore")
-    )
-
-    increment_version_number(
-      xcodeproj: ios_config[:project_path],
-      version_number: ios_config[:version_number]
-    )
-
-    latest_build_number = latest_testflight_build_number(
-      app_identifier: options[:app_identifier] || ios_config[:app_identifier],
-      api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
-      version: ios_config[:version_number]
-    )
-
-    increment_build_number(
-      xcodeproj: ios_config[:project_path],
-      build_number: latest_build_number + 1
-    )
-
-    set_plist_values
-
-    build_ios_project(
-      options.merge(
-        provisioning_profile_name: "match AppStore org.mifos.mobile"
+      setup_ci_if_needed
+      load_api_key(options)
+      fetch_certificates_with_match(
+        options.merge(match_type: "appstore")
       )
-    )
 
-    deliver(
-      screenshots_path: ios_config[:screenshots_ios_path],
-      metadata_path: options[:metadata_path] || ios_config[:metadata_path],
-      submit_for_review: false, # Set to true if you want to auto-submit for review
-      automatic_release: true, # Set to true if you want to auto-release once it approved
-      api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
-      skip_app_version_update: false,
-      force: true, # Skips HTML report verification
-      precheck_include_in_app_purchases: false,
-      overwrite_screenshots: true,
-      reject_if_possible: true,
-      app_rating_config_path: ios_config[:app_rating_config_path],
-      submission_information: {
-        add_id_info_uses_idfa: false,
-        add_id_info_limits_tracking: false,
-        add_id_info_serves_ads: false,
-        add_id_info_tracks_action: false,
-        add_id_info_tracks_install: false,
-        content_rights_has_rights: true,
-        content_rights_contains_third_party_content: false,
-        export_compliance_platform: 'ios',
-        export_compliance_compliance_required: false,
-        export_compliance_encryption_updated: false,
-        export_compliance_app_type: nil,
-        export_compliance_uses_encryption: false,
-        export_compliance_is_exempt: true,
-        export_compliance_contains_third_party_cryptography: false,
-        export_compliance_contains_proprietary_cryptography: false,
-        export_compliance_available_on_french_store: true
-      }
-    )
-  end
-end
+      increment_version_number(
+        xcodeproj: ios_config[:project_path],
+        version_number: ios_config[:version_number]
+      )
 
-platform :mac do
-  #############################
-  # Shared Private Lane Helpers
-  #############################
+      latest_build_number = latest_testflight_build_number(
+        app_identifier: options[:app_identifier] || ios_config[:app_identifier],
+        api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
+      )
 
-  private_lane :setup_ci_if_needed do
-    if ENV['CI']
-      setup_ci
-    else
-      UI.message("🖥️ Running locally, skipping CI-specific setup.")
-    end
-  end
+      increment_build_number(
+        xcodeproj: ios_config[:project_path],
+        build_number: latest_build_number + 1
+      )
 
-  private_lane :load_api_key_macos do |options|
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
+      update_plist(
+        plist_path: ios_config[:plist_path],
+        block: proc do |plist|
+          plist['NSContactsUsageDescription'] = 'This app does not access your contacts. This message is required for compliance only.'
+          plist['NSLocationWhenInUseUsageDescription'] = 'This app does not access your location. This message is required for compliance only.'
+          plist['NSBluetoothAlwaysUsageDescription'] = 'This app does not use Bluetooth. This message is required for compliance only.'
+        end
+      )
 
-    app_store_connect_api_key(
-      key_id: options[:appstore_key_id] || ios_config[:key_id],
-      issuer_id: options[:appstore_issuer_id] || ios_config[:issuer_id],
-      key_filepath: options[:key_filepath] || ios_config[:key_filepath],
-      duration: 1200
-    )
-  end
+      build_ios_project(
+        options.merge(
+            provisioning_profile_name: ios_config[:provisioning_profile_appstore]
+        )
+      )
 
-  private_lane :next_macos_build_number do |options|
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
-
-    latest = latest_testflight_build_number(
-      app_identifier: options[:app_identifier] || ios_config[:app_identifier],
-      api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
-      platform: "osx",
-      version: ios_config[:version_number]
-    )
-    (latest.to_i + 1).to_s
-  end
-
-  # Resolve the most-recent generated .pkg path
-    private_lane :find_pkg_path do
-      project_dir = File.expand_path('..', Dir.pwd)
-      Dir[File.join(project_dir, 'cmp-desktop', 'build', 'release', '**', 'pkg', '*.pkg')]
-        .max_by { |p| File.mtime(p) } || UI.user_error!('PKG not found!')
-    end
-
-  ###################
-  # Public lanes
-  ###################
-
-  desc "Build & upload macOS (.pkg) to TestFlight"
-  lane :desktop_testflight do |options|
-    setup_ci_if_needed
-    load_api_key_macos(options)
-
-    new_build_number = next_macos_build_number(options)
-
-    gradle(
-      tasks: ["packageReleasePkg"],
-      properties: {
-        "buildNumber" => new_build_number,
-        "macOsAppStoreRelease" => true
-      }
-    )
-
-    pkg_path = find_pkg_path
-        UI.message("Found PKG at: #{pkg_path}")
-
-    pilot(
-      api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
-      pkg: pkg_path,
-      app_platform: 'osx',
-      skip_waiting_for_build_processing: true,
-    )
-  end
-
-  desc "Build & submit macOS app to App Store (non-beta)"
-    lane :desktop_release do |options|
-    ios_config = FastlaneConfig::IosConfig::BUILD_CONFIG
-    setup_ci_if_needed
-    load_api_key_macos(options)
-
-    new_build_number = next_macos_build_number(options)
-
-    gradle(
-      tasks: ["packageReleasePkg"],
-      properties: {
-        "buildNumber" => new_build_number,
-        "macOsAppStoreRelease" => true
-      }
-    )
-
-    # Locate the produced PKG (adjust pattern if you rename)
-    pkg_path = find_pkg_path
-      UI.message("Found PKG at: #{pkg_path}")
-
-    deliver(
-      platform: 'osx',
-      pkg: pkg_path,
-      screenshots_path: ios_config[:screenshots_macos_path],
-      metadata_path: options[:metadata_path] || ios_config[:metadata_path],
-      submit_for_review: true, # Set to true if you want to auto-submit for review
-      automatic_release: true, # Set to true if you want to auto-release once it approved
-      api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
-      skip_app_version_update: false,
-      force: true, # Skips HTML report verification
-      precheck_include_in_app_purchases: false,
-      overwrite_screenshots: true,
-      reject_if_possible: true,
-      app_rating_config_path: ios_config[:app_rating_config_path],
-      submission_information: {
-        add_id_info_uses_idfa: false,
-        add_id_info_limits_tracking: false,
-        add_id_info_serves_ads: false,
-        add_id_info_tracks_action: false,
-        add_id_info_tracks_install: false,
-        content_rights_has_rights: true,
-        content_rights_contains_third_party_content: false,
-        export_compliance_platform: 'osx',
-        export_compliance_compliance_required: false,
-        export_compliance_encryption_updated: false,
-        export_compliance_app_type: nil,
-        export_compliance_uses_encryption: false,
-        export_compliance_is_exempt: true,
-        export_compliance_contains_third_party_cryptography: false,
-        export_compliance_contains_proprietary_cryptography: false,
-        export_compliance_available_on_french_store: true
-      }
-    )
+      deliver(
+        metadata_path: options[:metadata_path] || ios_config[:metadata_path],
+        submit_for_review: true, # Set to true if you want to auto-submit for review
+        automatic_release: true, # Set to true if you want to auto-release once it approved
+        api_key: Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY],
+        skip_app_version_update: true,
+        force: true, # Skips HTML report verification
+        precheck_include_in_app_purchases: false,
+        overwrite_screenshots: true,
+        reject_if_possible: true,
+        app_rating_config_path: ios_config[:app_rating_config_path],
+        submission_information: {
+          add_id_info_uses_idfa: false,
+          add_id_info_limits_tracking: false,
+          add_id_info_serves_ads: false,
+          add_id_info_tracks_action: false,
+          add_id_info_tracks_install: false,
+          content_rights_has_rights: true,
+          content_rights_contains_third_party_content: false,
+          export_compliance_platform: 'ios',
+          export_compliance_compliance_required: false,
+          export_compliance_encryption_updated: false,
+          export_compliance_app_type: nil,
+          export_compliance_uses_encryption: false,
+          export_compliance_is_exempt: true,
+          export_compliance_contains_third_party_cryptography: false,
+          export_compliance_contains_proprietary_cryptography: false,
+          export_compliance_available_on_french_store: true
+        }
+      )
   end
 end
\ No newline at end of file
diff --git a/fastlane/README.md b/fastlane/README.md
index c8de7f002..c37620477 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -114,7 +114,15 @@ Generate full release notes from specified tag or latest release tag
 [bundle exec] fastlane ios build_ios
 ```
 
-Build iOS application
+Build Ios application
+
+### ios build_signed_ios
+
+```sh
+[bundle exec] fastlane ios build_signed_ios
+```
+
+Build Signed Ios application
 
 ### ios increment_version
 
@@ -122,15 +130,7 @@ Build iOS application
 [bundle exec] fastlane ios increment_version
 ```
 
-
-
-### ios deploy_on_firebase
-
-```sh
-[bundle exec] fastlane ios deploy_on_firebase
-```
-
-Upload iOS application to Firebase App Distribution
+Increment build number from latest Firebase release
 
 ### ios generateReleaseNote
 
@@ -140,6 +140,30 @@ Upload iOS application to Firebase App Distribution
 
 Generate release notes
 
+### ios deploy_on_firebase
+
+```sh
+[bundle exec] fastlane ios deploy_on_firebase
+```
+
+Upload iOS application to Firebase App Distribution
+
+### ios beta
+
+```sh
+[bundle exec] fastlane ios beta
+```
+
+Upload beta build to TestFlight
+
+### ios release
+
+```sh
+[bundle exec] fastlane ios release
+```
+
+Upload iOS Application to AppStore
+
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
diff --git a/scripts/pre-commit.sh b/scripts/pre-commit.sh
index 04c785606..2f87f220e 100644
--- a/scripts/pre-commit.sh
+++ b/scripts/pre-commit.sh
@@ -4,7 +4,7 @@
 check_current_branch() {
     echo "\n🚀 Checking the current git branch..."
     CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-    if [ "$CURRENT_BRANCH" = "master" ] || [ "$CURRENT_BRANCH" = "development" ]; then
+    if [ "$CURRENT_BRANCH" = "master" ] || [ "$CURRENT_BRANCH" = "dev" ]; then
         echo "🛑 Hold it right there! Committing directly to the '$CURRENT_BRANCH' branch? That's a big no-no!"
         echo "🚫 Direct commits to '$CURRENT_BRANCH' are like trying to use a wrench to write code—doesn't work! 😜"
         echo "\nABORTING COMMIT: You must navigate to a feature branch or create a new one to save the day! 🦸‍♂️🦸‍♀️\n"
@@ -37,16 +37,19 @@ run_spotless_checks() {
 # Function to run ktlint checks
 run_dependency_guard() {
     printf "\n🚀 Brace yourself! We're about to generate dependency guard baseline!"
-    ./gradlew dependencyGuardBaseline
+    ./gradlew dependencyGuardBaseline > /tmp/dependency-result
     KT_EXIT_CODE=$?
 
     if [ ${KT_EXIT_CODE} -ne 0 ]; then
+        cat /tmp/dependency-result
+        rm /tmp/dependency-result
         printf "\n*********************************************************************************"
         echo "     💥 Oh no! Something went wrong! 💥"
         echo "     💡 Unable to generate dependency baseline. 🛠️"
         printf "*********************************************************************************\n"
         exit ${KT_EXIT_CODE}
     else
+        rm /tmp/dependency-result
         echo "🎉 Bravo! Dependency baseline has been generated successfully! Keep rocking that clean code! 🚀💫"
     fi
 }
diff --git a/scripts/pre-push.sh b/scripts/pre-push.sh
index 71bf5c432..d628bc07b 100644
--- a/scripts/pre-push.sh
+++ b/scripts/pre-push.sh
@@ -4,7 +4,7 @@
 check_current_branch() {
     printf "\n🚀 Checking the current git branch..."
     CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-    if [ "$CURRENT_BRANCH" = "master" ] || [ "$CURRENT_BRANCH" = "development" ]; then
+    if [ "$CURRENT_BRANCH" = "master" ] || [ "$CURRENT_BRANCH" = "dev" ]; then
         echo "🛑 Hold it right there! Committing directly to the '$CURRENT_BRANCH' branch? That's a big no-no!"
         echo "🚫 Direct commits to '$CURRENT_BRANCH' are like trying to use a wrench to write code—doesn't work! 😜"
         printf "\nABORTING COMMIT: You must navigate to a feature branch or create a new one to save the day! 🦸‍♂️🦸‍♀️\n"
@@ -28,7 +28,9 @@ run_spotless_checks() {
         echo "      💡 Tip: Check the reported issues and fix formatting errors. 🛠️"
         echo "*********************************************************************************"
         echo "🚀 Attempting to apply Spotless formatting fixes..."
-        ./gradlew spotlessApply --daemon
+        ./gradlew spotlessApply --daemon > /tmp/spotless-result
+        rm /tmp/spotless-result
+        echo "🎉 Stellar job! Your code is pristine and has passed Spotless's formatting checks without a hitch! Keep shining bright! ✨🚀"
     else
         rm /tmp/spotless-result
         echo "🎉 Stellar job! Your code is pristine and has passed Spotless's formatting checks without a hitch! Keep shining bright! ✨🚀"
@@ -58,18 +60,23 @@ run_detekt_checks() {
 # Function to run ktlint checks
 run_dependency_guard() {
     printf "\n🚀 Brace yourself! We're about to generate dependency guard baseline!"
-    ./gradlew dependencyGuard
+    ./gradlew dependencyGuard > /tmp/dependency-result
     KT_EXIT_CODE=$?
 
     if [ ${KT_EXIT_CODE} -ne 0 ]; then
+        cat /tmp/dependency-result
+        rm /tmp/dependency-result
         printf "\n*********************************************************************************"
         echo "     💥 Oh no! Something went wrong! 💥"
         echo "     💡 Unable to generate dependency baseline. 🛠️"
         printf "*********************************************************************************\n"
         echo "🚀 Attempting to generate dependency baseline again..."
-        ./gradlew dependencyGuardBaseline
-    else
+        ./gradlew dependencyGuardBaseline > /tmp/dependency-result
+        rm /tmp/dependency-result
         echo "🎉 Bravo! Dependency baseline has been generated successfully! Keep rocking that clean code! 🚀💫"
+    else
+        rm /tmp/dependency-result
+        echo "🎉 Bravo! Dependency baseline has been checked successfully! Keep rocking that clean code! 🚀💫"
     fi
 }