diff --git a/conferences-app/build.gradle.kts b/conferences-app/build.gradle.kts
index 58cde9201..813810b7a 100644
--- a/conferences-app/build.gradle.kts
+++ b/conferences-app/build.gradle.kts
@@ -59,11 +59,19 @@ android {
         }
     }
 
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
+
     defaultConfig {
         versionName = "1.0"
         versionCode = 1
     }
 
+    dependencies {
+        coreLibraryDesugaring(libs.android.tools.desugarjdk)
+    }
+
     namespace = "io.ashdavies.playground"
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4374d197a..307b75139 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidx-paging = "3.3.2"
 cash-sqldelight = "2.0.2"
 coil-kt = "3.0.0-alpha10"
 compose-plugin = "1.6.11"
-gitlive-firebase = "1.13.0"
+gitlive-firebase = "2.0.0"
 google-accompanist = "0.34.0"
 google-android = "8.5.2"
 google-maps-compose = "4.3.2"
@@ -21,6 +21,7 @@ slack-circuit = "0.23.1"
 
 [libraries]
 ajalt-clikt = "com.github.ajalt.clikt:clikt:4.4.0"
+android-tools-desugarjdk = "com.android.tools:desugar_jdk_libs:2.1.0"
 
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-annotation = "androidx.annotation:annotation:1.8.2"
diff --git a/remote-config/build.gradle.kts b/remote-config/build.gradle.kts
index 821a21ecb..c3dcb2a14 100644
--- a/remote-config/build.gradle.kts
+++ b/remote-config/build.gradle.kts
@@ -3,6 +3,14 @@ plugins {
 }
 
 android {
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
+
+    dependencies {
+        coreLibraryDesugaring(libs.android.tools.desugarjdk)
+    }
+
     namespace = "io.ashdavies.config"
 }
 
diff --git a/remote-config/src/commonMain/kotlin/io/ashdavies/config/RemoteConfig.kt b/remote-config/src/commonMain/kotlin/io/ashdavies/config/RemoteConfig.kt
index bd6ee5d77..6c5ce2032 100644
--- a/remote-config/src/commonMain/kotlin/io/ashdavies/config/RemoteConfig.kt
+++ b/remote-config/src/commonMain/kotlin/io/ashdavies/config/RemoteConfig.kt
@@ -5,6 +5,7 @@ import com.google.firebase.remoteconfig.ConfigUpdateListener
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigException
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.remoteconfig.FirebaseRemoteConfigValue
+import dev.gitlive.firebase.remoteconfig.android
 import dev.gitlive.firebase.remoteconfig.get
 import dev.gitlive.firebase.remoteconfig.remoteConfig