diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d5cff85a..54e222e0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -70,7 +70,7 @@ android {
     flavorDimensions.add("variants")
     productFlavors {
         register("core")
-        register("fdroid")
+        register("foss")
         register("prepaid")
     }
 
@@ -79,7 +79,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