diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5878fbf00..0829dcaa2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -85,7 +85,6 @@ android {
     @Suppress("LocalVariableName")
     buildTypes {
         getByName("debug") {
-            applicationIdSuffix = ".debug"
             firebaseCrashlytics {
                 mappingFileUploadEnabled = false
             }
@@ -98,7 +97,6 @@ android {
         getByName("release") {
             val tasks_mapbox_key: String? by project
             val tasks_google_key: String? by project
-
             resValue("string", "mapbox_key", tasks_mapbox_key ?: "")
             resValue("string", "google_key", tasks_google_key ?: "")
             isMinifyEnabled = true
@@ -111,10 +109,10 @@ android {
 
     productFlavors {
         create("generic") {
-            setDimension("store")
+            dimension("store")
         }
         create("googleplay") {
-            setDimension("store")
+            dimension("store")
         }
     }
 
diff --git a/app/src/debug/google-services.json b/app/src/debug/google-services.json
index 44d76c90b..9f2b97dfe 100644
--- a/app/src/debug/google-services.json
+++ b/app/src/debug/google-services.json
@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:448612483090:android:c31434c55745e54c",
         "android_client_info": {
-          "package_name": "org.tasks.debug"
+          "package_name": "org.tasks"
         }
       },
       "oauth_client": [
diff --git a/app/src/debug/res/values/keys.xml b/app/src/debug/res/values/keys.xml
index 73c4f0a01..759a5091f 100644
--- a/app/src/debug/res/values/keys.xml
+++ b/app/src/debug/res/values/keys.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="opentasks_authority" tools:node="replace">org.tasks.debug.opentasks</string>
   <string name="app_name" tools:ignore="PrivateResource">Tasks Debug</string>
-  <string name="app_package">org.tasks.debug</string>
-  <string name="backup_api_key">AEdPqrEAAAAImTf5DbfspggWrU9h06685ONycpUVwJj1JwawQQ</string>
   <string name="debug_strict_mode_thread">Strict mode - Thread</string>
   <string name="debug_strict_mode_vm">Strict mode - VM</string>
   <string name="debug_leakcanary">LeakCanary</string>
diff --git a/app/src/debug/res/xml/shortcuts.xml b/app/src/debug/res/xml/shortcuts.xml
deleted file mode 100644
index c9c390c04..000000000
--- a/app/src/debug/res/xml/shortcuts.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shortcuts xmlns:tools="http://schemas.android.com/tools"
-  xmlns:android="http://schemas.android.com/apk/res/android">
-    <shortcut
-      android:enabled="true"
-      android:shortcutId="static_new_task"
-      android:icon="@drawable/ic_outline_add_24px"
-      android:shortcutLongLabel="@string/action_new_task"
-      android:shortcutShortLabel="@string/action_new_task"
-      tools:targetApi="n_mr1">
-
-        <intent
-          android:action="android.intent.action.VIEW"
-          android:targetClass="com.todoroo.astrid.activity.MainActivity"
-          android:targetPackage="org.tasks.debug">
-            <extra
-              android:name="open_task"
-              android:value="0" />
-        </intent>
-    </shortcut>
-</shortcuts>
\ No newline at end of file
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index a9b217e15..6bc503a0d 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -3,7 +3,10 @@
   This file contains preference keys and preference list values.
   These should not be translated 
 -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="app_package">org.tasks</string>
+  <string name="opentasks_authority" tools:node="replace">org.tasks.opentasks</string>
+  <string name="backup_api_key">AEdPqrEAAAAI49v5bBusi_bq1bgLBB1LIsepNV0eBrFkQrBZkw</string>
   <string name="mdtp_ok">@string/ok</string>
   <string name="mdtp_cancel">@string/cancel</string>
   <string name="FSA_label">Tasks Shortcut</string>
diff --git a/app/src/release/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
similarity index 100%
rename from app/src/release/res/xml/shortcuts.xml
rename to app/src/main/res/xml/shortcuts.xml
diff --git a/app/src/release/res/values/keys.xml b/app/src/release/res/values/keys.xml
index 4b95f6ace..0b39dd0fe 100644
--- a/app/src/release/res/values/keys.xml
+++ b/app/src/release/res/values/keys.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="opentasks_authority" tools:node="replace">org.tasks.opentasks</string>
+<resources>
   <string name="app_name">Tasks</string>
-  <string name="app_package">org.tasks</string>
-  <string name="backup_api_key">AEdPqrEAAAAI49v5bBusi_bq1bgLBB1LIsepNV0eBrFkQrBZkw</string>
 </resources>
\ No newline at end of file