diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
index 208fbb6d73..ac6ec3ede1 100644
--- a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
@@ -221,6 +221,8 @@ object VectorStaticModule {
             gitRevisionDate = BuildConfig.GIT_REVISION_DATE,
             gitBranchName = BuildConfig.GIT_BRANCH_NAME,
             buildNumber = BuildConfig.BUILD_NUMBER,
+            flavorDescription = BuildConfig.FLAVOR_DESCRIPTION,
+            flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION,
     )
 
     @Provides
diff --git a/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt b/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
index dac4b8b9ed..cdc3fdd9c6 100644
--- a/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
@@ -27,4 +27,6 @@ data class BuildMeta(
         val gitRevisionDate: String,
         val gitBranchName: String,
         val buildNumber: String,
+        val flavorDescription: String,
+        val flavorShortDescription: String,
 )
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index a327395fd0..150f87bc02 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -25,7 +25,6 @@ import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
 import com.squareup.moshi.Types
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.getAllChildFragments
@@ -342,7 +341,7 @@ class BugReporter @Inject constructor(
 
                     // add some github labels
                     builder.addFormDataPart("label", buildMeta.versionName)
-                    builder.addFormDataPart("label", BuildConfig.FLAVOR_DESCRIPTION)
+                    builder.addFormDataPart("label", buildMeta.flavorDescription)
                     builder.addFormDataPart("label", buildMeta.gitBranchName)
 
                     // Special for Element
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
index 0df5f0e9cf..78329350d3 100644
--- a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
@@ -68,7 +68,7 @@ data class E2EWellKnownConfig(
         val secureBackupSetupMethods: List<String>? = null,
 
         /**
-         * Configuration for sharing keys strategy which should be used instead of [im.vector.app.BuildConfig.outboundSessionKeySharingStrategy].
+         * Configuration for sharing keys strategy which should be used instead of [im.vector.app.config.Config.KEY_SHARING_STRATEGY].
          * One of on_room_opening, on_typing or disabled.
          */
         @Json(name = "outbound_keys_pre_sharing_mode")
diff --git a/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
index c3d5532854..4c8188dc8b 100644
--- a/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.version
 
-import im.vector.app.BuildConfig
 import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.VersionCodeProvider
 import javax.inject.Inject
@@ -27,9 +26,9 @@ class VersionProvider @Inject constructor(
 ) {
 
     fun getVersion(longFormat: Boolean, useBuildNumber: Boolean): String {
-        var result = "${BuildConfig.VERSION_NAME} [${versionCodeProvider.getVersionCode()}]"
+        var result = "${buildMeta.versionName} [${versionCodeProvider.getVersionCode()}]"
 
-        var flavor = BuildConfig.SHORT_FLAVOR_DESCRIPTION
+        var flavor = buildMeta.flavorShortDescription
 
         if (flavor.isNotBlank()) {
             flavor += "-"
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
index 89ef96ecbc..50c9944794 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
@@ -30,4 +30,6 @@ fun aBuildMeta() = BuildMeta(
         gitRevisionDate = "01-01-01",
         gitBranchName = "a-branch-name",
         buildNumber = "100",
+        flavorDescription = "Gplay",
+        flavorShortDescription = "",
 )