diff --git a/android/common/src/main/java/com/tenforwardconsulting/bgloc/DistanceFilterLocationProvider.java b/android/common/src/main/java/com/marianhello/bgloc/provider/DistanceFilterLocationProvider.java
similarity index 97%
rename from android/common/src/main/java/com/tenforwardconsulting/bgloc/DistanceFilterLocationProvider.java
rename to android/common/src/main/java/com/marianhello/bgloc/provider/DistanceFilterLocationProvider.java
index bada0c48f..dfbcb04dc 100644
--- a/android/common/src/main/java/com/tenforwardconsulting/bgloc/DistanceFilterLocationProvider.java
+++ b/android/common/src/main/java/com/marianhello/bgloc/provider/DistanceFilterLocationProvider.java
@@ -9,7 +9,7 @@
 1. location is not persisted to db anymore, but broadcasted using intents instead
 */
 
-package com.tenforwardconsulting.bgloc;
+package com.marianhello.bgloc.provider;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -21,6 +21,7 @@
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
+import android.os.Build;
 import android.os.Bundle;
 
 import com.marianhello.bgloc.Config;
@@ -198,11 +199,18 @@ private void setPace(Boolean value) {
                 List<String> matchingProviders = locationManager.getAllProviders();
                 for (String provider: matchingProviders) {
                     if (provider != LocationManager.PASSIVE_PROVIDER) {
+                        logger.info("Requesting location updates from provider {}", provider);
                         locationManager.requestLocationUpdates(provider, 0, 0, this);
                     }
                 }
             } else {
-                locationManager.requestLocationUpdates(locationManager.getBestProvider(criteria, true), mConfig.getInterval(), scaledDistanceFilter, this);
+                String provider = locationManager.getBestProvider(criteria, true);
+                if (locationManager.getAllProviders().contains(LocationManager.GPS_PROVIDER) &&
+                        Build.VERSION.SDK_INT > 30) {
+                    provider = LocationManager.GPS_PROVIDER;
+                }
+                logger.info("Requesting location updates from provider {}", provider);
+                locationManager.requestLocationUpdates(provider, mConfig.getInterval(), scaledDistanceFilter, this);
             }
         } catch (SecurityException e) {
             logger.error("Security exception: {}", e.getMessage());
diff --git a/android/common/src/main/java/com/marianhello/bgloc/provider/LocationProviderFactory.java b/android/common/src/main/java/com/marianhello/bgloc/provider/LocationProviderFactory.java
index 4002e47c4..99873485a 100644
--- a/android/common/src/main/java/com/marianhello/bgloc/provider/LocationProviderFactory.java
+++ b/android/common/src/main/java/com/marianhello/bgloc/provider/LocationProviderFactory.java
@@ -12,7 +12,6 @@
 import android.content.Context;
 
 import com.marianhello.bgloc.Config;
-import com.tenforwardconsulting.bgloc.DistanceFilterLocationProvider;
 
 import java.lang.IllegalArgumentException;
 
diff --git a/android/common/src/main/java/com/marianhello/bgloc/provider/RawLocationProvider.java b/android/common/src/main/java/com/marianhello/bgloc/provider/RawLocationProvider.java
index fe781d368..8bf5d4399 100644
--- a/android/common/src/main/java/com/marianhello/bgloc/provider/RawLocationProvider.java
+++ b/android/common/src/main/java/com/marianhello/bgloc/provider/RawLocationProvider.java
@@ -5,6 +5,7 @@
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
+import android.os.Build;
 import android.os.Bundle;
 
 import com.marianhello.bgloc.Config;
@@ -35,18 +36,22 @@ public void onStart() {
         if (isStarted) {
             return;
         }
-
-        Criteria criteria = new Criteria();
-        criteria.setAltitudeRequired(false);
-        criteria.setBearingRequired(false);
-        criteria.setSpeedRequired(true);
-        criteria.setCostAllowed(true);
-        criteria.setAccuracy(Criteria.ACCURACY_FINE);
-        criteria.setHorizontalAccuracy(translateDesiredAccuracy(mConfig.getDesiredAccuracy()));
-        criteria.setPowerRequirement(Criteria.POWER_HIGH);
-
+        String provider = LocationManager.GPS_PROVIDER;
+        if (!locationManager.getAllProviders().contains(LocationManager.GPS_PROVIDER) ||
+                Build.VERSION.SDK_INT <= 30) {
+            Criteria criteria = new Criteria();
+            criteria.setAltitudeRequired(false);
+            criteria.setBearingRequired(false);
+            criteria.setSpeedRequired(true);
+            criteria.setCostAllowed(true);
+            criteria.setAccuracy(Criteria.ACCURACY_FINE);
+            criteria.setHorizontalAccuracy(translateDesiredAccuracy(mConfig.getDesiredAccuracy()));
+            criteria.setPowerRequirement(Criteria.POWER_HIGH);
+            provider = locationManager.getBestProvider(criteria, true);
+        }
         try {
-            locationManager.requestLocationUpdates(locationManager.getBestProvider(criteria, true), mConfig.getInterval(), mConfig.getDistanceFilter(), this);
+            logger.info("Requesting location updates from provider {}", provider);
+            locationManager.requestLocationUpdates(provider, mConfig.getInterval(), mConfig.getDistanceFilter(), this);
             isStarted = true;
         } catch (SecurityException e) {
             logger.error("Security exception: {}", e.getMessage());
diff --git a/plugin.xml b/plugin.xml
index 312e37e2c..e9aa0a971 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -88,6 +88,7 @@
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/PostLocationTask.java" target-dir="src/com/marianhello/bgloc" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/provider/AbstractLocationProvider.java" target-dir="src/com/marianhello/bgloc/provider" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/provider/ActivityRecognitionLocationProvider.java" target-dir="src/com/marianhello/bgloc/provider" />
+        <source-file src="android/common/src/main/java/com/marianhello/bgloc/provider/DistanceFilterLocationProvider.java" target-dir="src/com/marianhello/bgloc/provider" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/provider/LocationProviderFactory.java" target-dir="src/com/marianhello/bgloc/provider" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/provider/LocationProvider.java" target-dir="src/com/marianhello/bgloc/provider" />
         <source-file src="android/common/src/main/java/com/marianhello/bgloc/provider/ProviderDelegate.java" target-dir="src/com/marianhello/bgloc/provider" />
@@ -114,7 +115,6 @@
         <source-file src="android/common/src/main/java/com/marianhello/utils/Convert.java" target-dir="src/com/marianhello/utils" />
         <source-file src="android/common/src/main/java/com/marianhello/utils/TextUtils.java" target-dir="src/com/marianhello/utils" />
         <source-file src="android/common/src/main/java/com/marianhello/utils/ToneGenerator.java" target-dir="src/com/marianhello/utils" />
-        <source-file src="android/common/src/main/java/com/tenforwardconsulting/bgloc/DistanceFilterLocationProvider.java" target-dir="src/com/tenforwardconsulting/bgloc" />
         <source-file src="android/common/src/main/java/org/apache/commons/io/Charsets.java" target-dir="src/org/apache/commons/io" />
         <source-file src="android/common/src/main/java/org/apache/commons/io/input/ReversedLinesFileReader.java" target-dir="src/org/apache/commons/io/input" />
         <source-file src="android/common/src/main/java/org/chromium/content/browser/ThreadUtils.java" target-dir="src/org/chromium/content/browser" />