diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
index d6d4aa45..f296427a 100755
--- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java
@@ -84,18 +84,17 @@ public class CheckinClient {
                 .androidId(checkinInfo.androidId)
                 .checkin(new CheckinRequest.Checkin.Builder()
                         .build(new CheckinRequest.Checkin.Build.Builder()
-                                .bootloader(build.bootloader)
-                                .brand(build.brand)
+                                .bootloader(hasGooglePlayServices ? build.bootloader : "c2f2-0.2-5799621")
+                                .brand(hasGooglePlayServices ? build.brand : "google")
                                 .clientId("android-google")
-                                .device(build.device)
-                                //.fingerprint(build.fingerprint)
-                                .fingerprint(hasGooglePlayServices ? build.fingerprint : "google/sdk_gphone_x86/generic_x86_arm:11/RPB3.200720.005/6705141:user/release-keys")
-                                .hardware(build.hardware)
-                                .manufacturer(build.manufacturer)
-                                .model(build.model)
+                                .device(hasGooglePlayServices ? build.device : "generic")
+                                .fingerprint(hasGooglePlayServices ? build.fingerprint : "google/coral/coral:10/QD1A.190821.007/5831595:user/release-keys")
+                                .hardware(hasGooglePlayServices ? build.hardware : "coral")
+                                .manufacturer(hasGooglePlayServices ? build.manufacturer : "Google")
+                                .model(hasGooglePlayServices ? build.model : "mainline")
                                 .otaInstalled(false) // TODO?
                                 //.packageVersionCode(Constants.MAX_REFERENCE_VERSION)
-                                .product(build.product)
+                                .product(hasGooglePlayServices ? build.product : "coral")
                                 .radio(build.radio)
                                 .sdkVersion(build.sdk)
                                 .time(build.time / 1000)