diff --git a/app/build.gradle b/app/build.gradle
index 41ac6c6b6..eeea88ed8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,15 +133,22 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation "androidx.room:room-runtime:$room_version"
-    implementation "com.google.dagger:hilt-android:$hilt_version"
-    implementation "androidx.datastore:datastore:$datastore_version"
-    kapt "androidx.room:room-compiler:$room_version"
-    kapt "com.google.dagger:hilt-compiler:$hilt_version"
 
-    //OSMDROID, mgrs,
+    // Lifecycle
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
+
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-compiler:$hilt_version"
+    implementation "androidx.datastore:datastore:$datastore_version"
+
+    // Osmdroid & Maps
     implementation 'org.osmdroid:osmdroid-android:6.1.14'
     implementation 'com.github.MKergall:osmbonuspack:6.9.0'
     implementation 'org.osmdroid:osmdroid-wms:6.1.14'
diff --git a/build.gradle b/build.gradle
index 1c9ce9d1a..5e2dbbaff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     ext {
         kotlin_version = '1.6.21'
         coroutines_version = '1.6.0'
+        lifecycle_version = "2.5.1"
         room_version = '2.4.3'
         hilt_version = '2.40.5'
         datastore_version = '1.0.0'