diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
index 5c57dc3519..e9b9ff84e6 100644
--- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
@@ -80,6 +80,7 @@ object AppModule {
         isDebuggable = BuildConfig.DEBUG,
         buildType = buildType,
         applicationName = context.getString(R.string.app_name),
+        productionApplicationName = "Element",
         // Use the same name for desktop and mobile for now
         desktopApplicationName = context.getString(R.string.app_name),
         applicationId = BuildConfig.APPLICATION_ID,
diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt
index ada8861490..bfe6c06e00 100644
--- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt
+++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingPresenter.kt
@@ -33,7 +33,7 @@ class OnBoardingPresenter @Inject constructor(
     override fun present(): OnBoardingState {
         return OnBoardingState(
             isDebugBuild = buildMeta.buildType != BuildType.RELEASE,
-            applicationName = buildMeta.applicationName,
+            productionApplicationName = buildMeta.productionApplicationName,
             canLoginWithQrCode = OnBoardingConfig.CAN_LOGIN_WITH_QR_CODE,
             canCreateAccount = OnBoardingConfig.CAN_CREATE_ACCOUNT,
         )
diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt
index b091843f1f..7b7b9f7eec 100644
--- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt
+++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingState.kt
@@ -18,7 +18,7 @@ package io.element.android.features.onboarding.impl
 
 data class OnBoardingState(
     val isDebugBuild: Boolean,
-    val applicationName: String,
+    val productionApplicationName: String,
     val canLoginWithQrCode: Boolean,
     val canCreateAccount: Boolean,
 )
diff --git a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt
index 74557f62a9..d87fb36c03 100644
--- a/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt
+++ b/features/onboarding/impl/src/main/kotlin/io/element/android/features/onboarding/impl/OnBoardingView.kt
@@ -129,7 +129,7 @@ private fun OnBoardingContent(
                 )
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
-                    text = stringResource(id = R.string.screen_onboarding_welcome_message, state.applicationName),
+                    text = stringResource(id = R.string.screen_onboarding_welcome_message, state.productionApplicationName),
                     color = ElementTheme.materialColors.secondary,
                     style = ElementTheme.typography.fontBodyLgRegular.copy(fontSize = 17.sp),
                     textAlign = TextAlign.Center
diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
index 051a5dcf85..ad5581f631 100644
--- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
+++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/meta/BuildMeta.kt
@@ -20,6 +20,7 @@ data class BuildMeta(
     val buildType: BuildType,
     val isDebuggable: Boolean,
     val applicationName: String,
+    val productionApplicationName: String,
     val desktopApplicationName: String,
     val applicationId: String,
     val lowPrivacyLoggingEnabled: Boolean,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
index c23e5e82c3..2a70a56051 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
@@ -23,6 +23,7 @@ fun aBuildMeta(
     buildType: BuildType = BuildType.DEBUG,
     isDebuggable: Boolean = true,
     applicationName: String = "",
+    productionApplicationName: String = applicationName,
     desktopApplicationName: String = applicationName,
     applicationId: String = "",
     lowPrivacyLoggingEnabled: Boolean = true,
@@ -36,6 +37,7 @@ fun aBuildMeta(
     buildType = buildType,
     isDebuggable = isDebuggable,
     applicationName = applicationName,
+    productionApplicationName = productionApplicationName,
     desktopApplicationName = desktopApplicationName,
     applicationId = applicationId,
     lowPrivacyLoggingEnabled = lowPrivacyLoggingEnabled,
diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
index 17c744bb41..9c09d0bc98 100644
--- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
+++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt
@@ -33,6 +33,7 @@ object Singleton {
         isDebuggable = true,
         buildType = BuildType.DEBUG,
         applicationName = "EAX-Minimal",
+        productionApplicationName = "EAX-Minimal",
         desktopApplicationName = "EAX-Minimal-Desktop",
         applicationId = "io.element.android.samples.minimal",
         lowPrivacyLoggingEnabled = false,