diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5f55b92c..90bd73c31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+## 8.2.1-1 - August 9, 2019
+
+* Added CircleCI command to create google services json file in Release job #1166
+
 ## 8.2.1 - August 7, 2019
 
 * Added example of cache management methods usage #[1139](https://github.com/mapbox/mapbox-android-demo/pull/1139)
diff --git a/MapboxAndroidDemo/build.gradle b/MapboxAndroidDemo/build.gradle
index 797fc7a49..e99633e41 100644
--- a/MapboxAndroidDemo/build.gradle
+++ b/MapboxAndroidDemo/build.gradle
@@ -17,12 +17,7 @@ android {
         targetCompatibility 1.8
     }
 
-    playAccountConfigs {
-        defaultAccountConfig {
-            serviceAccountEmail = 'mapbox-android-demo-publish@android-gl-native.iam.gserviceaccount.com'
-            jsonFile = file("$project.rootDir/android-gl-native-6d21dd280e7b.json")
-        }
-    }
+
 
     defaultConfig {
         applicationId "com.mapbox.mapboxandroiddemo"
@@ -39,7 +34,6 @@ android {
 
         buildConfigField "int", "MIN_SDK_VERSION", "$minSdkVersion.apiLevel"
 
-        playAccountConfig = playAccountConfigs.defaultAccountConfig
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -48,7 +42,7 @@ android {
         }
     }
 
-    flavorDimensions "default"
+    flavorDimensions 'default'
 
     productFlavors {
         global {
@@ -103,10 +97,12 @@ android {
         disable 'MissingTranslation', 'ExtraTranslation'
     }
 
-    play {
-        track = 'alpha'
-        untrackOld = true
-    }
+}
+
+play {
+    track = 'alpha'
+    resolutionStrategy = 'auto'
+    serviceAccountCredentials = file("$project.rootDir/android-gl-native-6d21dd280e7b.json")
 }
 
 kotlinter {
diff --git a/MapboxAndroidDemo/src/global/play/contactEmail b/MapboxAndroidDemo/src/global/play/contact-email
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/contactEmail
rename to MapboxAndroidDemo/src/global/play/contact-email
diff --git a/MapboxAndroidDemo/src/global/play/contactPhone b/MapboxAndroidDemo/src/global/play/contact-phone
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/contactPhone
rename to MapboxAndroidDemo/src/global/play/contact-phone
diff --git a/MapboxAndroidDemo/src/global/play/contactWebsite b/MapboxAndroidDemo/src/global/play/contact-website
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/contactWebsite
rename to MapboxAndroidDemo/src/global/play/contact-website
diff --git a/MapboxAndroidDemo/src/global/play/defaultLanguage b/MapboxAndroidDemo/src/global/play/default-language
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/defaultLanguage
rename to MapboxAndroidDemo/src/global/play/default-language
diff --git a/MapboxAndroidDemo/src/global/play/en-US/listing/fulldescription b/MapboxAndroidDemo/src/global/play/listings/en-US/full-description
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/en-US/listing/fulldescription
rename to MapboxAndroidDemo/src/global/play/listings/en-US/full-description
diff --git a/MapboxAndroidDemo/src/global/play/en-US/listing/shortdescription b/MapboxAndroidDemo/src/global/play/listings/en-US/short-description
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/en-US/listing/shortdescription
rename to MapboxAndroidDemo/src/global/play/listings/en-US/short-description
diff --git a/MapboxAndroidDemo/src/global/play/en-US/listing/title b/MapboxAndroidDemo/src/global/play/listings/en-US/title
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/en-US/listing/title
rename to MapboxAndroidDemo/src/global/play/listings/en-US/title
diff --git a/MapboxAndroidDemo/src/global/play/en-US/listing/video b/MapboxAndroidDemo/src/global/play/listings/en-US/video-url
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/en-US/listing/video
rename to MapboxAndroidDemo/src/global/play/listings/en-US/video-url
diff --git a/MapboxAndroidDemo/src/global/play/en-US/whatsnew b/MapboxAndroidDemo/src/global/play/release-notes/en-US/default
similarity index 100%
rename from MapboxAndroidDemo/src/global/play/en-US/whatsnew
rename to MapboxAndroidDemo/src/global/play/release-notes/en-US/default
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 2cf281711..01018ec4e 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -66,7 +66,7 @@ ext {
             checkstyle          : '8.2',
             firebasePerformance : '1.2.1',
             gradle              : '3.4.2',
-            gradlePlayPublisher : '1.2.2',
+            gradlePlayPublisher : '2.0.0',
             kotlin              : '1.3.41',
             dependencyGraph     : '0.3.0',
             grgit               : '2.3.0',