diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a1ee67..4c8231f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(android_apps)
 
 find_package(catkin REQUIRED rosjava_build_tools)
 
-catkin_android_setup(assembleRelease uploadArchives)
+catkin_android_setup(assembleRelease assembleDebug uploadArchives)
 
 catkin_package()
 
diff --git a/build.gradle b/build.gradle
index c6d1189..4c4e48c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,11 +15,11 @@
  */
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.2.1'
+    gradleVersion = '2.14.1'
 }
 
 buildscript {
-    apply from: "https://github.com/rosjava/android_core/raw/indigo/buildscript.gradle"
+    apply from: "https://github.com/rosjava/android_core/raw/kinetic/buildscript.gradle"
 }
 
 apply plugin: 'catkin'
@@ -58,6 +58,4 @@ subprojects {
             }
         }
     }
-}
-
-defaultTasks 'assembleRelease', 'uploadArchives'
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac6fad3..a01520c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 26 22:07:46 IST 2015
+#Mon Apr 03 15:19:05 ART 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/make_a_map/build.gradle b/make_a_map/build.gradle
index ba6048e..066c674 100644
--- a/make_a_map/build.gradle
+++ b/make_a_map/build.gradle
@@ -25,17 +25,18 @@ dependencies {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 15
+  compileSdkVersion 25
+  buildToolsVersion "25.0.2"
 
   defaultConfig {
     minSdkVersion 15
-    targetSdkVersion 15
+    targetSdkVersion 25
     versionCode 3
     versionName "1.0.1"
   }
   productFlavors {
-    indigo {
-      applicationId "com.github.rosjava.android_apps.make_a_map.indigo"
+    kinetic {
+      applicationId "com.github.rosjava.android_apps.make_a_map.kinetic"
     }
   }
 
diff --git a/map_manager/build.gradle b/map_manager/build.gradle
index 6b67f9a..a5d8598 100644
--- a/map_manager/build.gradle
+++ b/map_manager/build.gradle
@@ -22,17 +22,18 @@ dependencies {
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 15
+  compileSdkVersion 25
+  buildToolsVersion "25.0.2"
 
   defaultConfig {
     minSdkVersion 15
-    targetSdkVersion 15
+    targetSdkVersion 25
     versionCode 3
     versionName "1.0.0"
   }
   productFlavors {
-    indigo {
-      applicationId "com.github.rosjava.android_apps.map_manager.indigo"
+    kinetic {
+      applicationId "com.github.rosjava.android_apps.map_manager.kinetic"
     }
   }
 }
diff --git a/map_nav/build.gradle b/map_nav/build.gradle
index b030d69..d4f5b65 100644
--- a/map_nav/build.gradle
+++ b/map_nav/build.gradle
@@ -25,17 +25,18 @@ dependencies {
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 15
+  compileSdkVersion 25
+  buildToolsVersion "25.0.2"
 
   defaultConfig {
     minSdkVersion 15
-    targetSdkVersion 15
+    targetSdkVersion 25
     versionCode 3
     versionName "1.0.0"
   }
   productFlavors {
-    indigo {
-      applicationId "com.github.rosjava.android_apps.map_nav.indigo"
+    kinetic {
+      applicationId "com.github.rosjava.android_apps.map_nav.kinetic"
     }
   }
 }
diff --git a/teleop/build.gradle b/teleop/build.gradle
index c59ab1c..c3761d8 100644
--- a/teleop/build.gradle
+++ b/teleop/build.gradle
@@ -22,17 +22,18 @@ dependencies {
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 15
+  compileSdkVersion 25
+  buildToolsVersion "25.0.2"
 
   defaultConfig {
     minSdkVersion 15
-    targetSdkVersion 15
+    targetSdkVersion 25
     versionCode 2
     versionName "1.0.0"
   }
   productFlavors {
-    indigo {
-      applicationId "com.github.rosjava.android_apps.teleop.indigo"
+    kinetic {
+      applicationId "com.github.rosjava.android_apps.teleop.kinetic"
       }
   }
 }