diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2d320cce6152..13a6e4d19157 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -224,6 +224,16 @@ android {
 
 }
 
+androidComponents {
+    onVariants { variant ->
+        variant.outputs.forEach { output ->
+            if (output is com.android.build.api.variant.impl.VariantOutputImpl) {
+                output.outputFileName.set("${variant.name}-${output.versionCode.orNull}.apk")
+            }
+        }
+    }
+}
+
 ksp.arg("room.schemaLocation", "$projectDir/schemas")
 
 // Configure KSP for test variants
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index efa6fd895a2f..516c83ee4ca8 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -14,7 +14,6 @@
     <dimen name="nav_drawer_header_height">164dp</dimen>
     <dimen name="nav_drawer_menu_avatar_radius">12sp</dimen>
     <dimen name="list_item_avatar_icon_radius">20dp</dimen>
-    <dimen name="action_bar_margin_top">64dp</dimen>
     <dimen name="bottom_sheet_text_start_margin">40dp</dimen>
     <dimen name="bottom_sheet_item_height">56dp</dimen>
     <dimen name="bottom_sheet_menu_item_divider_standard_margin">56dp</dimen>