diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1c6d409f6..d7a2dc031 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -43,7 +43,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "io.ente.photos"
         minSdkVersion 16
         targetSdkVersion 28
@@ -65,6 +64,15 @@ android {
         release {
             signingConfig signingConfigs.release
         }
+        debug {
+          applicationIdSuffix '.debug'
+          versionNameSuffix "-debug"
+          externalNativeBuild {
+            cmake {
+              arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}${applicationIdSuffix}"
+            }
+          }
+        }
     }
 }
 
diff --git a/android/app/src/debug/res/values/strings.xml b/android/app/src/debug/res/values/strings.xml
new file mode 100644
index 000000000..85e2970e6
--- /dev/null
+++ b/android/app/src/debug/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Photos Debug</string>
+</resources>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8c2529a72..b4fd53443 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="Photos"
+        android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher">
         
         <activity
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
new file mode 100644
index 000000000..d898af909
--- /dev/null
+++ b/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Photos</string>
+</resources>