diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b871d534..06da7422 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,11 +6,6 @@ plugins {
     alias(libs.plugins.android)
     alias(libs.plugins.kotlinAndroid)
     alias(libs.plugins.ksp)
-    base
-}
-
-base {
-    archivesName.set("contacts")
 }
 
 val keystorePropertiesFile: File = rootProject.file("keystore.properties")
@@ -28,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()
+        setProperty("archivesBaseName", "contacts-$versionCode")
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas")
         }
@@ -68,7 +64,7 @@ android {
     flavorDimensions.add("variants")
     productFlavors {
         register("core")
-        register("fdroid")
+        register("foss")
         register("prepaid")
     }
 
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