diff --git a/device-lineage.mk b/device-lineage.mk
index fa90676..43da7d3 100644
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -49,6 +49,9 @@ PRODUCT_PACKAGES += \
     android.hardware.confirmationui-lib.trusty:64 \
     libteeui_hal_support.vendor:64
 
+# GMS
+WITH_GMS_COMMS_SUITE := false
+
 # Graphics
 PRODUCT_PACKAGES += \
     libEGL_angle \