diff --git a/app/build.gradle b/app/build.gradle
index 632c83d3bc..a5b9c23edf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,31 +23,32 @@ kapt {
     correctErrorTypes true
 }
 
+def VERSION_CODE = 280
 def VERSION_NAME = "3.0.9"
 
 android {
+    namespace 'com.naviapp'
     compileSdk 32
     buildToolsVersion "30.0.3"
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
-        incremental = true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        incremental true
     }
     testOptions {
         unitTests.returnDefaultValues = true
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = '1.8'
     }
     lint {
         disable 'NullSafeMutableLiveData'
     }
-    namespace 'com.naviapp'
     defaultConfig {
         applicationId "com.naviapp"
         minSdk 21
         targetSdk 31
-        versionCode 280
+        versionCode VERSION_CODE
         versionName VERSION_NAME
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -277,17 +278,16 @@ dependencies {
     implementation project(":navi-amc")
     implementation project(":navi-insurance")
     implementation project(":navi-hl")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version_kotlin_coroutines"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version_kotlin_coroutines"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation "com.google.android.material:material:$material_version"
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'android.arch.work:work-runtime-ktx:1.0.1'
+    implementation "androidx.work:work-runtime-ktx:$work_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2'
     implementation glideLibs.implementation
     kapt glideLibs.kapt
@@ -317,16 +317,13 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
 
-
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
 
     // Espresso dependencies
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-web:3.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.2.0'
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-web:$espresso_version"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$espresso_version"
     testImplementation('com.navi.medici.test-library:database-library:0.0.26-SNAPSHOT') {
         exclude group: "org.postgresql"
         exclude group: "org.apache.commons"
@@ -338,7 +335,8 @@ dependencies {
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.4.1'
     androidTestImplementation 'android.arch.core:core-testing:1.1.1'
     testImplementation 'android.arch.core:core-testing:1.1.1'
-    testImplementation 'junit:junit:4.13'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
     testImplementation 'io.mockk:mockk:1.10.2'
 
     // Dependency for postgres
diff --git a/build.gradle b/build.gradle
index 7a466c2394..6ee9e890f2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.0'
-    ext.room_version = '2.4.0-alpha03'
-    ext.work_version = '2.5.0'
-    ext.lottie_version = '5.2.0'
     repositories {
         google()
         mavenCentral()
@@ -36,7 +32,7 @@ buildscript {
 }
 
 plugins {
-    id('com.diffplug.spotless') version('6.11.0')
+    id 'com.diffplug.spotless' version '6.11.0'
     id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
 }
 
diff --git a/dependencies.gradle b/dependencies.gradle
index db1eaa8aed..066354d9e1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,16 +1,25 @@
 ext {
 
-    hiltVersion = "2.44"
-    compose_version = '1.2.0-beta03'
+    android_junit_version = '1.1.4'
     appcompat_version = '1.5.1'
+    compose_version = '1.2.0-beta03'
+    core_version = '1.6.0'
+    espresso_version = '3.5.0'
+    hilt_version = '2.44'
+    junit_version = '4.13.2'
+    lifecycle_version = '2.5.1'
+    lottie_version = '5.2.0'
+    material_version = '1.7.0'
+    room_version = '2.4.3'
+    work_version = '2.7.1'
 
     hiltLibs = [
-            implementation : "com.google.dagger:hilt-android:$hiltVersion",
-            kapt : "com.google.dagger:hilt-compiler:$hiltVersion",
-            androidTest : "com.google.dagger:hilt-android-testing:$hiltVersion",
-            kaptAndroidTest : "com.google.dagger:hilt-compiler:$hiltVersion",
-            test : "com.google.dagger:hilt-android-testing:$hiltVersion",
-            kaptTest : "com.google.dagger:hilt-compiler:$hiltVersion"
+            implementation : "com.google.dagger:hilt-android:$hilt_version",
+            kapt : "com.google.dagger:hilt-compiler:$hilt_version",
+            androidTest : "com.google.dagger:hilt-android-testing:$hilt_version",
+            kaptAndroidTest : "com.google.dagger:hilt-compiler:$hilt_version",
+            test : "com.google.dagger:hilt-android-testing:$hilt_version",
+            kaptTest : "com.google.dagger:hilt-compiler:$hilt_version"
     ]
 
     fragmentLibs = [
diff --git a/navi-amc/build.gradle b/navi-amc/build.gradle
index 74c7a8c8a9..781710f50e 100644
--- a/navi-amc/build.gradle
+++ b/navi-amc/build.gradle
@@ -2,49 +2,51 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'kotlin-android-extensions'
+    id 'kotlin-parcelize'
     id 'dagger.hilt.android.plugin'
     id 'androidx.navigation.safeargs.kotlin'
 }
 
 android {
+    namespace 'com.navi.amc'
     compileSdk 32
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdk 21
         targetSdk 31
-        multiDexEnabled = true
+
+        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
     }
-    buildFeatures {
-        dataBinding true
-        viewBinding true
-        compose true
-    }
+
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        dataBinding true
+        viewBinding true
+        compose true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        incremental true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_version
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     packagingOptions {
         resources {
             excludes += ['META-INF']
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        incremental = true
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-    }
-    namespace 'com.navi.amc'
 }
 
 repositories {
@@ -55,13 +57,13 @@ dependencies {
     implementation project(":navi-common")
     implementation project(":navi-widgets")
     implementation project(":navi-chat")
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 
     // Glide
     implementation "com.github.bumptech.glide:glide:4.11.0"
@@ -82,11 +84,8 @@ dependencies {
     implementation fragmentLibs.ktx
 
     //ViewModel & LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
-
-    // LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 
     // multidex
     implementation("androidx.multidex:multidex:2.0.1")
diff --git a/navi-analytics/build.gradle b/navi-analytics/build.gradle
index 63d42abdbb..4c7cedcbf5 100644
--- a/navi-analytics/build.gradle
+++ b/navi-analytics/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.navi.analytics'
     compileSdk 32
 
     defaultConfig {
@@ -23,18 +24,18 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-        incremental = true
+        incremental true
     }
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    namespace 'com.navi.analytics'
 }
+
 dependencies {
     implementation project(":pulse")
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation "com.google.android.material:material:$material_version"
     // for UXCam
     implementation 'com.uxcam:uxcam:3.3.5@aar'
     //Appsflyer sdk integration
diff --git a/navi-base/build.gradle b/navi-base/build.gradle
index 1050b73eb8..ae632bc299 100644
--- a/navi-base/build.gradle
+++ b/navi-base/build.gradle
@@ -2,10 +2,11 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'kotlin-android-extensions'
+    id 'kotlin-parcelize'
 }
 
 android {
+    namespace 'com.navi.base'
     compileSdk 32
 
     defaultConfig {
@@ -29,14 +30,13 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    namespace 'com.navi.base'
 }
 
 dependencies {
     api 'com.google.code.gson:gson:2.8.9'
     implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha03'
     api 'com.jakewharton.timber:timber:4.7.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 }
diff --git a/navi-base/proguard-rules.pro b/navi-base/proguard-rules.pro
index 5785433355..481bb43481 100644
--- a/navi-base/proguard-rules.pro
+++ b/navi-base/proguard-rules.pro
@@ -18,6 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-#For Easing Interpolator
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/navi-chat/build.gradle b/navi-chat/build.gradle
index 87f7458e4c..72fa24ff40 100644
--- a/navi-chat/build.gradle
+++ b/navi-chat/build.gradle
@@ -2,11 +2,12 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'kotlin-android-extensions'
+    id 'kotlin-parcelize'
     id 'dagger.hilt.android.plugin'
 }
 
 android {
+    namespace 'com.navi.chat'
     compileSdk 32
 
     defaultConfig {
@@ -23,48 +24,47 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        incremental = true
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         dataBinding true
         compose true
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        incremental true
+    }
     composeOptions {
         kotlinCompilerExtensionVersion compose_version
     }
-    namespace 'com.navi.chat'
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation "com.google.android.material:material:$material_version"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 
     // Navi common module
     implementation project(':navi-common')
 
     // Hilt
-    implementation "com.google.dagger:hilt-android:$hiltVersion"
-    kapt "com.google.dagger:hilt-compiler:$hiltVersion"
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-compiler:$hilt_version"
     // Hilt for instrumentation tests
-    androidTestImplementation "com.google.dagger:hilt-android-testing:$hiltVersion"
-    kaptAndroidTest "com.google.dagger:hilt-compiler:$hiltVersion"
+    androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
+    kaptAndroidTest "com.google.dagger:hilt-compiler:$hilt_version"
     // Hilt for local unit tests
-    testImplementation "com.google.dagger:hilt-android-testing:$hiltVersion"
-    kaptTest "com.google.dagger:hilt-compiler:$hiltVersion"
+    testImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
+    kaptTest "com.google.dagger:hilt-compiler:$hilt_version"
 
     // Retrofit
     implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
@@ -75,5 +75,5 @@ dependencies {
     implementation fragmentLibs.ktx
 
     // Room Database
-    kapt 'androidx.room:room-compiler:2.4.0-alpha03'
+    kapt "androidx.room:room-compiler:$room_version"
 }
diff --git a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt
index 3666096fc6..57fce317eb 100644
--- a/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt
+++ b/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt
@@ -75,7 +75,6 @@ import dagger.hilt.android.EntryPointAccessors
 import java.io.File
 import java.util.*
 import javax.inject.Inject
-import kotlinx.android.synthetic.main.fragment_common_navi_chat.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
@@ -757,10 +756,10 @@ class NaviChatFragment : ChatBaseFragment(), WidgetCallback, MessageOperation, T
     }
 
     private fun updateStatesOfMessage() {
-        val recyclerViewState = rvChat.layoutManager?.onSaveInstanceState()
+        val recyclerViewState = binding.rvChat.layoutManager?.onSaveInstanceState()
         Timber.d("Adding new item : calling from updateStatesOfMessage()")
         chatRVAdapter.notifyDataSetChanged()
-        rvChat.layoutManager?.onRestoreInstanceState(recyclerViewState)
+        binding.rvChat.layoutManager?.onRestoreInstanceState(recyclerViewState)
     }
 
     override fun updateTypingStatus(naviChatTypingStatusWidget: NaviChatTypingStatusWidget) {
diff --git a/navi-common/build.gradle b/navi-common/build.gradle
index 2b46cbcc6f..7d8b18954c 100644
--- a/navi-common/build.gradle
+++ b/navi-common/build.gradle
@@ -7,6 +7,7 @@ plugins {
 }
 
 android {
+    namespace 'com.navi.common'
     compileSdk 32
 
     defaultConfig {
@@ -24,25 +25,24 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        incremental = true
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         dataBinding true
         compose true
     }
-    lint {
-        disable 'NullSafeMutableLiveData'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        incremental true
     }
     composeOptions {
         kotlinCompilerExtensionVersion compose_version
     }
-    namespace 'com.navi.common'
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    lint {
+        disable 'NullSafeMutableLiveData'
+    }
 }
 
 static def formatString(String value) {
@@ -54,9 +54,9 @@ ext {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation "com.google.android.material:material:$material_version"
     api 'com.google.code.gson:gson:2.8.5'
     api 'com.google.firebase:firebase-config-ktx'
     implementation 'com.google.firebase:firebase-analytics'
@@ -64,9 +64,9 @@ dependencies {
     releaseApi 'com.github.chuckerteam.chucker:library-no-op:3.5.2'
     api "com.squareup.retrofit2:retrofit:2.9.0"
     api 'com.squareup.retrofit2:converter-gson:2.9.0'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
     implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
 
     api "com.airbnb.android:lottie:$lottie_version"
@@ -91,9 +91,9 @@ dependencies {
     implementation 'in.juspay:google-pay-client-api:1.0.0'
 
     // Room Database
-    kapt 'androidx.room:room-compiler:2.4.0-alpha03'
-    api 'androidx.room:room-runtime:2.4.0-alpha03'
-    api 'androidx.room:room-ktx:2.4.0-alpha03'
+    kapt "androidx.room:room-compiler:$room_version"
+    api "androidx.room:room-runtime:$room_version"
+    api "androidx.room:room-ktx:$room_version"
 
     // Coroutine
     api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
diff --git a/navi-design/build.gradle b/navi-design/build.gradle
index d2e4413d5b..b1d7ef5e20 100644
--- a/navi-design/build.gradle
+++ b/navi-design/build.gradle
@@ -1,11 +1,12 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'kotlin-android-extensions'
     id 'kotlin-kapt'
+    id 'kotlin-parcelize'
 }
 
 android {
+    namespace 'com.navi.design'
     compileSdk 32
 
     defaultConfig {
@@ -22,29 +23,27 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        incremental = true
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         dataBinding true
         compose true
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        incremental true
+    }
     composeOptions {
         kotlinCompilerExtensionVersion compose_version
     }
-    namespace 'com.navi.design'
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
     api project(":navi-base")
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    testImplementation 'junit:junit:4.+'
     api "androidx.compose.ui:ui:$compose_version"
     api "androidx.compose.material:material:$compose_version"
     api "androidx.compose.ui:ui-tooling-preview:$compose_version"
@@ -52,15 +51,16 @@ dependencies {
     androidTestApi "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugApi "androidx.compose.ui:ui-tooling:$compose_version"
     debugApi "androidx.compose.ui:ui-test-manifest:$compose_version"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0-rc02'
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     api 'androidx.activity:activity-compose:1.4.0'
-    api 'androidx.core:core-ktx:1.6.0'
+    api "androidx.core:core-ktx:$core_version"
     api 'com.google.code.gson:gson:2.8.9'
     api 'androidx.hilt:hilt-navigation-compose:1.0.0'
     api "com.airbnb.android:lottie:$lottie_version"
-    implementation 'com.google.android.material:material:1.6.1'
-    api 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
+    implementation "com.google.android.material:material:$material_version"
+    api "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation "com.google.accompanist:accompanist-appcompat-theme:0.25.1"
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 }
diff --git a/navi-hl/build.gradle b/navi-hl/build.gradle
index df174b338f..00247f4213 100644
--- a/navi-hl/build.gradle
+++ b/navi-hl/build.gradle
@@ -2,47 +2,47 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'kotlin-android-extensions'
+    id 'kotlin-parcelize'
     id 'dagger.hilt.android.plugin'
     id 'androidx.navigation.safeargs.kotlin'
 }
 
 android {
+    namespace 'com.navi.hl'
     compileSdk 32
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdk 21
         targetSdk 31
-        multiDexEnabled = true
+
+        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
     }
-    buildFeatures {
-        dataBinding true
-    }
-    buildFeatures {
-        viewBinding true
-    }
+
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        dataBinding true
+        viewBinding true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        incremental true
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     packagingOptions {
         resources {
             excludes += ['META-INF']
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        incremental = true
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    namespace 'com.navi.hl'
 }
 
 repositories {
@@ -51,7 +51,6 @@ repositories {
 
 dependencies {
     implementation project(":navi-common")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
@@ -70,9 +69,9 @@ dependencies {
     // Fragment
     implementation fragmentLibs.ktx
 
-    //ViewModel & LiveData
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
+    // ViewModel & LiveData
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 
     // multidex
     implementation("androidx.multidex:multidex:2.0.1")
diff --git a/navi-hl/consumer-rules.pro b/navi-hl/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/navi-insurance/build.gradle b/navi-insurance/build.gradle
index 20d8de928a..7a56a4626f 100644
--- a/navi-insurance/build.gradle
+++ b/navi-insurance/build.gradle
@@ -6,46 +6,41 @@ plugins {
     id 'dagger.hilt.android.plugin'
 }
 
-def VERSION_NAME = "1.1.0"
-def VERSION_CODE = 79
-
 android {
+    namespace 'com.navi.insurance'
     compileSdk 32
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdk 21
         targetSdk 31
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
         multiDexEnabled true
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
         resValue "string", "google_maps_key", 'AIzaSyDXTb0mpKvY8MPtdxllfmtEwZEM8aAC49Y'
     }
 
-    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
-        incremental = true
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
-    buildFeatures {
-        dataBinding true
-        compose true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-    }
-
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
+    buildFeatures {
+        dataBinding true
+        compose true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        incremental true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_version
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     flavorDimensions "app"
     productFlavors {
         qa {
@@ -65,7 +60,6 @@ android {
             buildConfigField 'String', 'GI_RAZORPAY_KEY', formatString('rzp_test_vBmFshr0H06Hoe')
         }
     }
-    namespace 'com.navi.insurance'
 }
 
 ext {
@@ -80,8 +74,7 @@ static def formatString(String value) {
 dependencies {
     implementation project(":navi-common")
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation 'com.android.support:multidex:1.0.3'
 
@@ -95,7 +88,7 @@ dependencies {
     implementation 'com.google.android.libraries.places:places:2.6.0'
     implementation playCore.implementation
 
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation "com.google.android.material:material:$material_version"
 
     implementation "androidx.security:security-crypto:1.1.0-alpha03"
 
@@ -105,8 +98,7 @@ dependencies {
     implementation "androidx.cardview:cardview:1.0.0"
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
-    implementation("androidx.core:core-ktx:1.3.2")
-    implementation("androidx.lifecycle:lifecycle-process:2.2.0")
+    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
 
     implementation "com.squareup.retrofit2:retrofit:$version_retrofit"
     implementation "com.squareup.retrofit2:converter-gson:$version_retrofit"
@@ -116,8 +108,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.squareup.okhttp3:logging-interceptor:4.4.1'
 
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-
     implementation group: 'joda-time', name: 'joda-time', version: '2.10.5'
     implementation 'org.joda:joda-money:1.0.1'
 
@@ -132,18 +122,18 @@ dependencies {
 
     implementation 'io.github.ShawnLin013:number-picker:2.4.13'
 
-    implementation 'android.arch.work:work-runtime-ktx:1.0.1'
+    implementation "androidx.work:work-runtime-ktx:$work_version"
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
     testImplementation 'io.mockk:mockk:1.10.2'
     testImplementation 'android.arch.core:core-testing:1.1.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
     implementation 'in.payu:native-otp-assist:1.2.0'
     implementation 'in.payu:payu-gpay:1.4.0'
     implementation 'in.payu:phonepe-intent:1.6.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
 
     implementation glideLibs.implementation
     kapt glideLibs.kapt
diff --git a/navi-vkyc/build.gradle b/navi-vkyc/build.gradle
index 4ead5ed1c9..0a462dc7d6 100644
--- a/navi-vkyc/build.gradle
+++ b/navi-vkyc/build.gradle
@@ -2,11 +2,12 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'kotlin-android-extensions'
+    id 'kotlin-parcelize'
     id 'dagger.hilt.android.plugin'
 }
 
 android {
+    namespace 'com.navi.vkyc'
     compileSdk 32
 
     defaultConfig {
@@ -23,6 +24,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    buildFeatures {
+        dataBinding true
+    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -31,22 +35,17 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-
-    buildFeatures {
-        dataBinding true
-    }
-    namespace 'com.navi.vkyc'
 }
 
 dependencies {
 
     implementation project(":navi-common")
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.4.0'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation "com.google.android.material:material:$material_version"
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 
     implementation hiltLibs.implementation
     kapt hiltLibs.kapt
diff --git a/navi-vkyc/consumer-rules.pro b/navi-vkyc/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/navi-widgets/build.gradle b/navi-widgets/build.gradle
index ddea190166..ee37f65ca1 100644
--- a/navi-widgets/build.gradle
+++ b/navi-widgets/build.gradle
@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+    namespace 'com.navi.naviwidgets'
     compileSdk 32
 
     defaultConfig {
@@ -22,34 +23,33 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        incremental = true
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
     buildFeatures {
         dataBinding true
         compose true
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+        incremental true
+    }
     composeOptions {
         kotlinCompilerExtensionVersion compose_version
     }
-    namespace 'com.navi.naviwidgets'
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation "com.google.android.material:material:$material_version"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     api project(":navi-analytics")
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
     api project(":navi-design")
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     // Timber library
diff --git a/pulse/build.gradle b/pulse/build.gradle
index aaddfda7a6..2338fe629a 100644
--- a/pulse/build.gradle
+++ b/pulse/build.gradle
@@ -5,8 +5,9 @@ plugins {
 }
 
 android {
+    namespace 'com.navi.pulse'
     compileSdk 32
-    buildToolsVersion "30.0.3"
+
     defaultConfig {
         minSdk 21
         targetSdk 31
@@ -14,6 +15,7 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -27,25 +29,23 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
-    namespace 'com.navi.pulse'
 }
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.71"
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation "androidx.core:core-ktx:$core_version"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation "androidx.room:room-runtime:2.4.0-alpha03"
+    implementation "com.google.android.material:material:$material_version"
+    implementation "androidx.room:room-runtime:$room_version"
     // Kotlin + coroutines
-    implementation 'androidx.work:work-runtime-ktx:2.7.1'
+    implementation "androidx.work:work-runtime-ktx:$work_version"
 
 
     // To use Kotlin annotation processing tool (kapt)
-    kapt "androidx.room:room-compiler:2.4.0-alpha03"
+    kapt "androidx.room:room-compiler:$room_version"
 
     // optional - Kotlin Extensions and Coroutines support for Room
-    implementation 'androidx.room:room-ktx:2.4.0-alpha03'
+    implementation "androidx.room:room-ktx:$room_version"
 
     api "com.squareup.retrofit2:retrofit:2.9.0"
     api 'com.squareup.retrofit2:converter-gson:2.9.0'
@@ -54,9 +54,9 @@ dependencies {
     releaseImplementation 'com.github.chuckerteam.chucker:library-no-op:3.5.2'
 
     // optional - Test helpers
-    testImplementation "androidx.room:room-testing:2.4.0-alpha03"
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    testImplementation "androidx.room:room-testing:$room_version"
+    testImplementation "junit:junit:$junit_version"
+    androidTestImplementation "androidx.test.ext:junit:$android_junit_version"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
 
 }