diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index e97886183..94e8a6b54 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -71,8 +71,8 @@ jobs:
 
     strategy:
       matrix:
-        api-level: [ 29 ]
-        target: [ google_apis ]
+        api-level: [25, 29] # Bug in API 21-24
+        target: [default, google_apis]
 
     steps:
       - name: Set up JDK 17
diff --git a/app/build.gradle b/app/build.gradle
index aaeda55ca..f4e189402 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,6 +111,7 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled = true
     }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17
@@ -125,6 +126,9 @@ android {
 dependencies {
     implementation project(path: ':engine')
 
+    // Desugaring
+    coreLibraryDesugaring(libs.desugar.jdk.libs.nio)
+
 // AndroidX
     implementation libs.androidx.appcompat
     implementation libs.androidx.constraintlayout
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b93f816f6..b894bae92 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,6 +2,7 @@
 androidGradlePlugin = "8.5.1"
 barista = "3.9.0"
 countlySdk = "24.7.0"
+desugar_jdk_libs_nio = "2.0.4"
 faker = "2.0.4"
 mockito = "5.12.0"
 robolectric = "4.13"
@@ -55,6 +56,7 @@ gms-googleServices = "4.4.1"
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 barista = { module = "com.schibsted.spain:barista", version.ref = "barista" }
 countly-sdk = { module = "ly.count.android:sdk", version.ref = "countlySdk" }
+desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" }
 faker = { module = "com.github.blocoio:faker", version.ref = "faker" }
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
 fastlane-screengrab = { module = "tools.fastlane:screengrab", version.ref = "fastlaneScreengrab" }