diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7c7664c05..7a7e766d4 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,4 +1,5 @@
 # Mapbox Plugin testapp ProGuard rules.
 
--keep class com.google.**
--dontwarn com.google.**
\ No newline at end of file
+# --- GMS ---
+-keep public class com.google.android.gms.* { public *; }
+-dontwarn com.google.android.gms.**
\ No newline at end of file
diff --git a/plugin-geojson/proguard-consumer.pro b/plugin-geojson/proguard-consumer.pro
index 1128f20d5..d4e789f0a 100644
--- a/plugin-geojson/proguard-consumer.pro
+++ b/plugin-geojson/proguard-consumer.pro
@@ -2,7 +2,7 @@
 
 # --- AutoValue ---
 # AutoValue annotations are retained but dependency is compileOnly.
--dontwarn com.google.auto.value.AutoValue
+-dontwarn com.google.auto.value.**
 
 # --- Retrofit ---
 # Retain generic type information for use by reflection by converters and adapters.
diff --git a/plugin-locationlayer/proguard-consumer.pro b/plugin-locationlayer/proguard-consumer.pro
index 74b666f11..377893234 100644
--- a/plugin-locationlayer/proguard-consumer.pro
+++ b/plugin-locationlayer/proguard-consumer.pro
@@ -2,7 +2,7 @@
 
 # --- AutoValue ---
 # AutoValue annotations are retained but dependency is compileOnly.
--dontwarn com.google.auto.value.AutoValue
+-dontwarn com.google.auto.value.**
 
 # --- Retrofit ---
 # Retain generic type information for use by reflection by converters and adapters.
diff --git a/plugin-offline/proguard-consumer.pro b/plugin-offline/proguard-consumer.pro
index fc96d4fe4..33a63ea41 100644
--- a/plugin-offline/proguard-consumer.pro
+++ b/plugin-offline/proguard-consumer.pro
@@ -2,7 +2,7 @@
 
 # --- AutoValue ---
 # AutoValue annotations are retained but dependency is compileOnly.
--dontwarn com.google.auto.value.AutoValue
+-dontwarn com.google.auto.value.**
 
 # --- Retrofit ---
 # Retain generic type information for use by reflection by converters and adapters.
diff --git a/plugin-places/proguard-consumer.pro b/plugin-places/proguard-consumer.pro
index 6848276ab..47070a645 100644
--- a/plugin-places/proguard-consumer.pro
+++ b/plugin-places/proguard-consumer.pro
@@ -2,7 +2,7 @@
 
 # --- AutoValue ---
 # AutoValue annotations are retained but dependency is compileOnly.
--dontwarn com.google.auto.value.AutoValue
+-dontwarn com.google.auto.value.**
 
 # --- Retrofit ---
 # Retain generic type information for use by reflection by converters and adapters.