diff --git a/changelog.d/2829.bugfix b/changelog.d/2829.bugfix
new file mode 100644
index 00000000000..203af1f3610
--- /dev/null
+++ b/changelog.d/2829.bugfix
@@ -0,0 +1 @@
+Add missing `app_id` and `Version` properties to bug reports.
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
index 468d9bc1f42..295fa17563d 100755
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporter.kt
@@ -161,6 +161,9 @@ class DefaultBugReporter @Inject constructor(
                         .addFormDataPart("sdk_sha", sdkMetadata.sdkGitSha)
                         .addFormDataPart("local_time", LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME))
                         .addFormDataPart("utc_time", LocalDateTime.ofInstant(Instant.now(), ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME))
+                        .addFormDataPart("app_id", buildMeta.applicationId)
+                        // Nightly versions have a custom version name suffix that we should remove for the bug report
+                        .addFormDataPart("Version", buildMeta.versionName.replace("-nightly", ""))
                     currentTracingFilter?.let {
                         builder.addFormDataPart("tracing_filter", it)
                     }
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt
index 9d165ea844a..f2c8d0d0a8c 100755
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt
@@ -154,6 +154,6 @@ class DefaultBugReporterTest {
     }
 
     companion object {
-        private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 15
+        private const val EXPECTED_NUMBER_OF_PROGRESS_VALUE = 17
     }
 }