diff --git a/Sample/FCCustomThemeSample/build.gradle b/Sample/FCCustomThemeSample/build.gradle
index 3c1dca7..b50dafd 100755
--- a/Sample/FCCustomThemeSample/build.gradle
+++ b/Sample/FCCustomThemeSample/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/Sample/FCFileProviderSample/build.gradle b/Sample/FCFileProviderSample/build.gradle
index 3c1dca7..b50dafd 100755
--- a/Sample/FCFileProviderSample/build.gradle
+++ b/Sample/FCFileProviderSample/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/Sample/FCPushNotificationSample/build.gradle b/Sample/FCPushNotificationSample/build.gradle
index f3fcb1c..63b82fa 100755
--- a/Sample/FCPushNotificationSample/build.gradle
+++ b/Sample/FCPushNotificationSample/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.google.gms:google-services:4.3.3'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/Sample/FCRestoreUserSample/build.gradle b/Sample/FCRestoreUserSample/build.gradle
index 3c1dca7..b50dafd 100644
--- a/Sample/FCRestoreUserSample/build.gradle
+++ b/Sample/FCRestoreUserSample/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/Sample/FreshchatSample/build.gradle b/Sample/FreshchatSample/build.gradle
index f3fcb1c..63b82fa 100644
--- a/Sample/FreshchatSample/build.gradle
+++ b/Sample/FreshchatSample/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.google.gms:google-services:4.3.3'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/build.gradle b/build.gradle
index 3c1dca7..b50dafd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/freshchat_sdk/src/main/AndroidManifest.xml b/freshchat_sdk/src/main/AndroidManifest.xml
index 3760a68..d848afe 100644
--- a/freshchat_sdk/src/main/AndroidManifest.xml
+++ b/freshchat_sdk/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.freshchat.consumer.sdk"
     android:versionCode="1"
     android:versionName="1.0">
 
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..ccd5dda 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,5 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
+# org.gradle.parallel=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f0c0324..d327064 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip