diff --git a/config/common.mk b/config/common.mk
index bac3ec2..f74bde7 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -131,9 +131,13 @@
 -include vendor/overlays/bliss_overlays.mk
 
 # Gapps
+ifneq ($(USE_FOSS), true)
 ifeq ($(BLISS_BUILD_VARIANT), gapps)
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)
 endif
+endif
 
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
+ifneq ($(USE_FOSS), true)
 -include vendor/bliss/config/partner_gms.mk
+endif