diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 94c3e4386..13f1ed0fd 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -4,6 +4,13 @@
 
     <uses-sdk tools:overrideLibrary="com.google.android.gms.threadnetwork" />
 
+    <queries>
+        <!-- For GMS Core/Play service -->
+        <package android:name="com.google.android.gms" />
+        <package android:name="com.android.vending" />
+        <!-- End of GMS Core/Play service-->
+    </queries>
+
     <application
         android:name="io.homeassistant.companion.android.HomeAssistantApplication" >
         <meta-data android:name="io.sentry.auto-init" android:value="false" />
diff --git a/automotive/src/full/AndroidManifest.xml b/automotive/src/full/AndroidManifest.xml
index ad2ceb4a3..e9778a3ad 100644
--- a/automotive/src/full/AndroidManifest.xml
+++ b/automotive/src/full/AndroidManifest.xml
@@ -4,6 +4,13 @@
 
     <uses-sdk tools:overrideLibrary="com.google.android.gms.threadnetwork" />
 
+    <queries>
+        <!-- For GMS Core/Play service -->
+        <package android:name="com.google.android.gms" />
+        <package android:name="com.android.vending" />
+        <!-- End of GMS Core/Play service-->
+    </queries>
+
     <application
         android:name="io.homeassistant.companion.android.HomeAssistantApplication" >
         <meta-data android:name="io.sentry.auto-init" android:value="false" />