diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md
index 6c896464..3fbc949b 100644
--- a/android/CHANGELOG.md
+++ b/android/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+- Bump SentrySDK to 8.17.0
+- Fix crash when title is null [#514](https://github.com/EmergeTools/hackernews/pull/514)
+- Set Compile SDK to 36
+
 ## 1.0.2 - 2024-11-20
 
 - Fix crash in CommentsScreen due to incorrect timestamp
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index feca213d..ca1c1e7b 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -14,12 +14,12 @@ val runningEnv: String? = System.getenv("RUNNING_ENV")
 
 android {
   namespace = "com.emergetools.hackernews"
-  compileSdk = 35
+  compileSdk = 36
 
   defaultConfig {
     applicationId = "com.emergetools.hackernews"
     minSdk = 30
-    targetSdk = 35
+    targetSdk = 36
     versionCode = 14
     versionName = "1.0.3"
 
@@ -132,7 +132,7 @@ sentry {
 
   ignoredVariants.set(listOf("debug", "fast"))
 
-  autoInstallation.sentryVersion.set("8.17.0")
+  autoInstallation.sentryVersion.set(libs.versions.sentry.sdk.get())
 }
 
 dependencies {
diff --git a/android/app/src/main/res/mipmap-anydpi/emerge_logo.png b/android/app/src/main/res/mipmap-anydpi/emerge_logo.png
new file mode 100644
index 00000000..b7a6c13d
Binary files /dev/null and b/android/app/src/main/res/mipmap-anydpi/emerge_logo.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/emerge_logo.png b/android/app/src/main/res/mipmap-hdpi/emerge_logo.png
new file mode 100644
index 00000000..b7a6c13d
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/emerge_logo.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/emerge_logo.png b/android/app/src/main/res/mipmap-mdpi/emerge_logo.png
new file mode 100644
index 00000000..b7a6c13d
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/emerge_logo.png differ
diff --git a/android/app/src/test/resources/robolectric.properties b/android/app/src/test/resources/robolectric.properties
new file mode 100644
index 00000000..023edbd6
--- /dev/null
+++ b/android/app/src/test/resources/robolectric.properties
@@ -0,0 +1,2 @@
+# Need to use SDK = 35 until https://github.com/robolectric/robolectric/issues/10103 is resolved
+sdk=35
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 1056256e..0495c966 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -31,6 +31,7 @@ composeBom = "2025.06.01"
 uiTestJunit4Android = "1.8.3"
 uiautomator = "2.3.0"
 benchmarkMacroJunit4 = "1.3.4"
+sentry-sdk = "8.17.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }