diff --git a/gradle.properties b/gradle.properties
index a695d35..f4fcfb4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,3 +10,4 @@ kotlin.native.ignoreDisabledTargets=true
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g
 group=app.softwork
 android.useAndroidX=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
diff --git a/kotlinx-uuid-core/build.gradle.kts b/kotlinx-uuid-core/build.gradle.kts
index aca7908..e07923d 100644
--- a/kotlinx-uuid-core/build.gradle.kts
+++ b/kotlinx-uuid-core/build.gradle.kts
@@ -62,8 +62,9 @@ android {
             localDevices {
                 register("pixel2api30") {
                     device = "Pixel 2"
-                    apiLevel = 30
+                    apiLevel = 34
                     systemImageSource = "aosp"
+                    require64Bit = true
                 }
             }
         }