diff --git a/config/common.mk b/config/common.mk
index 70472d8f..e1ab47eb 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -361,7 +361,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
   ro.cm.display.version=$(CM_DISPLAY_VERSION)
 
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
-
+-include vendor/cm/config/partner_gms.mk
 -include vendor/cyngn/product.mk
 
 $(call prepend-product-if-exists, vendor/extra/product.mk)
diff --git a/config/partner_gms.mk b/config/partner_gms.mk
new file mode 100644
index 00000000..5be75510
--- /dev/null
+++ b/config/partner_gms.mk
@@ -0,0 +1,3 @@
+ifeq ($(WITH_GMS),true)
+$(call inherit-product-if-exists, vendor/partner_gms/products/gms.mk)
+endif