diff --git a/app/build.gradle b/app/build.gradle
index 9236b55e8..6732075bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,6 +22,12 @@ android {
     compileSdkVersion 27
     buildToolsVersion '27.0.3'
 
+    defaultConfig {
+        versionCode 1003001
+        versionName getVersionName()
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
     buildTypes {
         // use proguard on debug too since we have unknowingly broken
         // release builds before.
@@ -32,6 +38,12 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'src/androidTest/proguard-rules.pro'
         }
+        debug {
+            applicationIdSuffix ".debug"
+            resValue "string", "applicationId", fullApplicationId + applicationIdSuffix
+            versionNameSuffix "-debug"
+            println 'buildTypes.debug defaultConfig.versionCode ' + defaultConfig.versionCode
+        }
     }
 
     flavorDimensions "base"
@@ -63,21 +75,6 @@ android {
         preDexLibraries = preDexEnabled && !isCi
     }
 
-    defaultConfig {
-        versionCode 1003001
-        versionName getVersionName()
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        debug {
-            applicationIdSuffix ".debug"
-            resValue "string", "applicationId", fullApplicationId + applicationIdSuffix
-            versionNameSuffix "-debug"
-            println 'buildTypes.debug defaultConfig.versionCode ' + defaultConfig.versionCode
-        }
-    }
-
     testOptions {
         unitTests {
             includeAndroidResources = true