diff --git a/android/app/build.gradle b/android/app/build.gradle
index 23e13ce8a..674276f94 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -3,16 +3,16 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "software.amazon.awssdk.iotsamples"
         minSdkVersion 26
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        ndkVersion "21.0.6113669"
+        ndkVersion "23.1.7779620"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -37,20 +37,19 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
-
+    ndkVersion '23.1.7779620'
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
-    maven {
-        url System.getenv('HOME') + "/.m2/repository"
-    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(":iotdevicesdk")
-    implementation 'software.amazon.awssdk.crt:android:0.15.8'
+    implementation 'software.amazon.awssdk.crt:aws-crt-android:0.15.11'
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core:1.2.0'
diff --git a/android/build.gradle b/android/build.gradle
index 448e61e16..1592886fd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath "com.android.tools.build:gradle:7.0.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -20,7 +20,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
+        mavenCentral()
     }
 }
 
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index b055934b0..144af2a40 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/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-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/android/iotdevicesdk/build.gradle b/android/iotdevicesdk/build.gradle
index c44583bf4..ab5729766 100644
--- a/android/iotdevicesdk/build.gradle
+++ b/android/iotdevicesdk/build.gradle
@@ -42,33 +42,39 @@ ext {
 }
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode = gitVersionCode()
         versionName = gitVersionName()
-        ndkVersion "21.0.6113669"
+        ndkVersion "23.1.7779620"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
 
     sourceSets {
-        main {
-            java.srcDir '../../sdk/src/main/java'
+        main.java {
+            srcDirs = ['../../sdk/src/main/java',
+                       '../../sdk/greengrass/event-stream-rpc-model/src/main/java',
+                       '../../sdk/greengrass/event-stream-rpc-client/src/main/java',
+                       '../../sdk/greengrass/event-stream-rpc-server/src/main/java',
+                       '../../sdk/greengrass/greengrass-client/src/event-stream-rpc-java/client',
+                       '../../sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model'
+            ]
         }
     }
 
     buildTypes {
-        debug {
-            versionNameSuffix = gitVersionTag()
-        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            versionNameSuffix ""
+        }
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -76,18 +82,16 @@ android {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
+    ndkVersion '23.1.7779620'
 }
 
 repositories {
+    mavenLocal()
     mavenCentral()
-    maven {
-        url System.getenv('HOME') + "/.m2/repository"
-    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'software.amazon.awssdk.crt:android:0.15.8'
+    implementation 'software.amazon.awssdk.crt:aws-crt-android:0.15.11'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
@@ -128,16 +132,19 @@ afterEvaluate {
                 from components.release
 
                 groupId = 'software.amazon.awssdk.iotdevicesdk'
-                artifactId = 'android'
+                artifactId = 'aws-iot-device-sdk-android'
                 version = android.defaultConfig.versionName
             }
+
+
             debug(MavenPublication) {
                 from components.debug
 
                 groupId = 'software.amazon.awssdk.iotdevicesdk'
-                artifactId = 'android'
+                artifactId = 'aws-iot-device-sdk-android'
                 version = android.defaultConfig.versionName + '-SNAPSHOT'
             }
+
         }
         repositories {
             maven {
@@ -145,6 +152,8 @@ afterEvaluate {
                 def releaseRepo = "https://aws.oss.sonatype.org/"
                 url = version.endsWith('SNAPSHOT') ? snapshotRepo : releaseRepo
             }
+            mavenLocal()
+
         }
     }
 }