diff --git a/app/build.gradle b/app/build.gradle
index eea4fa5..5b71c26 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     namespace "net.moasdawiki.app"
-    compileSdkVersion 33 // 33 = Android 13
+    compileSdk 33 // 33 = Android 13
     defaultConfig {
         applicationId "net.moasdawiki.app"
-        minSdkVersion 28 // 28 = Android 9
-        targetSdkVersion 33 // should be same as compileSdkVersion
+        minSdk 28 // 28 = Android 9
+        targetSdk 33 // should be same as compileSdk
         versionCode 36
         versionName "3.6.1.0"
-        archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -22,6 +21,9 @@ android {
         // Workaround for KotlinNullPointerException in :app:lintVitalAnalyzeRelease
         checkReleaseBuilds false
     }
+    base {
+        archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
+    }
 }
 
 dependencies {