diff --git a/play-services-core/src/main/kotlin/org/microg/gms/provision/ProvisionService.kt b/play-services-core/src/main/kotlin/org/microg/gms/provision/ProvisionService.kt
index 79fd32c5..df37e477 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/provision/ProvisionService.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/provision/ProvisionService.kt
@@ -12,11 +12,12 @@ import android.util.Log
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.delay
-import org.microg.gms.checkin.CheckinPrefs
-import org.microg.gms.gcm.GcmPrefs
+import org.microg.gms.checkin.getCheckinServiceInfo
+import org.microg.gms.checkin.setCheckinServiceConfiguration
 import org.microg.gms.gcm.getGcmServiceInfo
 import org.microg.gms.gcm.setGcmServiceConfiguration
-import org.microg.gms.snet.SafetyNetPrefs
+import org.microg.gms.snet.getSafetyNetServiceInfo
+import org.microg.gms.snet.setSafetyNetServiceConfiguration
 
 class ProvisionService : LifecycleService() {
     private fun Bundle.getBooleanOrNull(key: String): Boolean? {
@@ -31,9 +32,9 @@ class ProvisionService : LifecycleService() {
                 Log.d(TAG, "Provisioning: $s")
             }
 
-            intent?.extras?.getBooleanOrNull("checkin_enabled")?.let { CheckinPrefs.setEnabled(this@ProvisionService, it) }
+            intent?.extras?.getBooleanOrNull("checkin_enabled")?.let { setCheckinServiceConfiguration(this@ProvisionService, getCheckinServiceInfo(this@ProvisionService).configuration.copy(enabled = it)) }
             intent?.extras?.getBooleanOrNull("gcm_enabled")?.let { setGcmServiceConfiguration(this@ProvisionService, getGcmServiceInfo(this@ProvisionService).configuration.copy(enabled = it)) }
-            intent?.extras?.getBooleanOrNull("safetynet_enabled")?.let { SafetyNetPrefs.get(this@ProvisionService).isEnabled = it }
+            intent?.extras?.getBooleanOrNull("safetynet_enabled")?.let { setSafetyNetServiceConfiguration(this@ProvisionService, getSafetyNetServiceInfo(this@ProvisionService).configuration.copy(enabled = it)) }
             // What else?
 
             delay(2 * 1000) // Wait 2 seconds to give provisioning some extra time