diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b11f6aec8c..a49c19c060 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -60,6 +60,10 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
+        // Set the base archive name for publishing purposes. This is used to derive the APK and AAB
+        // artifact names when uploading to Firebase and Play Store.
+        base.archivesName = "com.x8bit.bitwarden"
+
         buildConfigField(
             type = "String",
             name = "CI_INFO",
diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts
index 2694c98a49..0799067291 100644
--- a/authenticator/build.gradle.kts
+++ b/authenticator/build.gradle.kts
@@ -47,6 +47,10 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
+        // Set the base archive name for publishing purposes. This is used to derive the APK and AAB
+        // artifact names when uploading to Firebase and Play Store.
+        base.archivesName = "com.bitwarden.authenticator"
+
         buildConfigField(
             type = "String",
             name = "CI_INFO",