diff --git a/app/build.gradle b/app/build.gradle
index 6db015b7b..016b2faf2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,12 +27,6 @@ android {
     }
 
     buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-
         debug {
             multiDexEnabled true
             debuggable true
@@ -50,6 +44,16 @@ android {
                 archivesBaseName = 'NewPipe_' + normalizedWorkingBranch
             }
         }
+
+        // Keep the release build type at the end of the list to override 'archivesBaseName' of
+        // debug build. This seems to be a Gradle bug, therefore
+        // TODO: update Gradle version
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            archivesBaseName = 'app'
+        }
     }
 
     lintOptions {