diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c9d682c8..87d7bd19 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.konan.properties.Properties
 import java.io.FileInputStream
@@ -5,11 +6,6 @@ import java.io.FileInputStream
 plugins {
     alias(libs.plugins.android)
     alias(libs.plugins.kotlinAndroid)
-    base
-}
-
-base {
-    archivesName.set("file-manager")
 }
 
 val keystorePropertiesFile: File = rootProject.file("keystore.properties")
@@ -27,6 +23,7 @@ android {
         targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
         versionName = project.libs.versions.app.version.versionName.get()
         versionCode = project.libs.versions.app.version.versionCode.get().toInt()
+        archivesName.set("file-manager-$versionCode")
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
     }
@@ -66,7 +63,7 @@ android {
     flavorDimensions.add("variants")
     productFlavors {
         register("core")
-        register("fdroid")
+        register("foss")
         register("prepaid")
     }
 
@@ -75,7 +72,7 @@ android {
     }
 
     compileOptions {
-        val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get().toString())
+        val currentJavaVersionFromLibs = JavaVersion.valueOf(libs.versions.app.build.javaVersion.get())
         sourceCompatibility = currentJavaVersionFromLibs
         targetCompatibility = currentJavaVersionFromLibs
     }
diff --git a/app/src/fdroid/res/values/bools.xml b/app/src/foss/res/values/bools.xml
similarity index 100%
rename from app/src/fdroid/res/values/bools.xml
rename to app/src/foss/res/values/bools.xml