diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 049862b7b..6f3709b26 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -39,8 +39,11 @@ updates:
     directory: kotlin/android/
     schedule:
       interval: daily
-    # Requires using a newer Java runtime
-    ignore: org.jetbrains.kotlin:kotlin-gradle-plugin
+    ignore:
+      # Depends on org.jetbrains.kotlin:kotlin-gradle-plugin version
+      - dependency-name: com.google.dagger.hilt.android
+      # Depends on JDK version which is bundled with Android Studio (JDK 17)
+      - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
   - package-ecosystem: gradle
     directory: kotlin/android/app/
     schedule:
diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts
index 61e6d19e8..7fb2d1d27 100644
--- a/kotlin/android/app/build.gradle.kts
+++ b/kotlin/android/app/build.gradle.kts
@@ -1,13 +1,15 @@
 plugins {
     id("com.android.application")
-    id("kotlin-android")
     id("com.google.dagger.hilt.android")
-    id("kotlin-parcelize")
     id("com.google.gms.google-services")
     id("com.google.firebase.crashlytics")
     id("com.diffplug.spotless") version "6.22.0"
-    id("kotlin-kapt")
     id("com.google.firebase.appdistribution")
+    id("kotlin-parcelize")
+    id("androidx.navigation.safeargs")
+
+    kotlin("android")
+    kotlin("kapt")
 }
 
 spotless {
@@ -54,8 +56,8 @@ android {
             // Find this in the Engineering 1Password vault
             storeFile = file(System.getenv("KEYSTORE_PATH") ?: "keystore.jks")
             keyAlias = "upload"
-            storePassword = System.getenv("KEYSTORE_PASSWORD")
-            keyPassword = System.getenv("KEYSTORE_KEY_PASSWORD")
+            storePassword = System.getenv("KEYSTORE_PASSWORD") ?: ""
+            keyPassword = System.getenv("KEYSTORE_KEY_PASSWORD") ?: ""
         }
     }
 
@@ -164,12 +166,12 @@ dependencies {
     implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
 
     // Hilt
-    implementation("com.google.dagger:hilt-android:2.48.1")
+    implementation("com.google.dagger:hilt-android:2.48")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.core:core-ktx:$coreVersion")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     kapt("androidx.hilt:hilt-compiler:1.0.0")
-    kapt("com.google.dagger:hilt-android-compiler")
+    kapt("com.google.dagger:hilt-android-compiler:2.48")
 
     // Retrofit 2
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
diff --git a/kotlin/android/build.gradle.kts b/kotlin/android/build.gradle.kts
index f86635b81..390b212bb 100644
--- a/kotlin/android/build.gradle.kts
+++ b/kotlin/android/build.gradle.kts
@@ -6,6 +6,10 @@ buildscript {
         maven(url = "https://jitpack.io")
         maven(url = "https://plugins.gradle.org/m2/")
     }
+
+    dependencies {
+        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.4")
+    }
 }
 
 plugins {
@@ -13,7 +17,7 @@ plugins {
     id("com.android.application") version "8.1.2" apply false
     id("com.android.library") version "8.1.2" apply false
     id("com.google.firebase.appdistribution") version "4.0.0" apply false
-    id("com.google.dagger.hilt.android") version "2.44" apply false
+    id("com.google.dagger.hilt.android") version "2.48" apply false
     id("com.google.gms.google-services") version "4.4.0" apply false
     id("org.mozilla.rust-android-gradle.rust-android") version "0.9.3" apply false
     id("com.google.firebase.crashlytics") version "2.9.9" apply false