diff --git a/app/build.gradle b/app/build.gradle
index bea7a6899..ed058702a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,6 @@ android {
         minSdkVersion 16
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        resValue 'string', 'mapbox_key', project.hasProperty('tasks_mapbox_key') ? tasks_mapbox_key : ''
-        resValue 'string', 'google_key', project.hasProperty('tasks_google_key') ? tasks_google_key : ''
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -47,9 +45,13 @@ android {
 
     buildTypes {
         debug {
+            resValue 'string', 'mapbox_key', project.hasProperty('tasks_mapbox_key_debug') ? tasks_mapbox_key_debug : ''
+            resValue 'string', 'google_key', project.hasProperty('tasks_google_key_debug') ? tasks_google_key_debug : ''
             testCoverageEnabled true
         }
         release {
+            resValue 'string', 'mapbox_key', project.hasProperty('tasks_mapbox_key') ? tasks_mapbox_key : ''
+            resValue 'string', 'google_key', project.hasProperty('tasks_google_key') ? tasks_google_key : ''
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.pro'
             signingConfig signingConfigs.release