diff --git a/config/common.mk b/config/common.mk
index 07df34d2..2ac1fd92 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -1,5 +1,6 @@
 # Allow vendor/extra to override any property by setting it first
 $(call inherit-product-if-exists, vendor/extra/product.mk)
+$(call inherit-product, vendor/lineage/config/scoop.mk)
 
 PRODUCT_BRAND ?= LineageOS
 
@@ -239,9 +240,11 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
 endif
 
 # SetupWizard
+ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     setupwizard.theme=glif_v4 \
     setupwizard.feature.day_night_mode_enabled=true
+endif
 
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay/no-rro
 PRODUCT_PACKAGE_OVERLAYS += \
@@ -269,6 +272,7 @@ PRODUCT_EXTRA_RECOVERY_KEYS += \
 include vendor/lineage/config/version.mk
 
 # -include vendor/lineage-priv/keys/keys.mk
-
 -include $(WORKSPACE)/build_env/image-auto-bits.mk
 -include vendor/lineage/config/partner_gms.mk
+
+#$(call inherit-product, vendor/lineage/config/scoop.mk)
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 08619d9d..d72da8b6 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -9,9 +9,11 @@ include vendor/lineage/config/aosp_audio.mk
 include vendor/lineage/config/lineage_audio.mk
 
 # Default notification/alarm sounds
+ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.notification_sound=Argon.ogg \
     ro.config.alarm_alert=Hassium.ogg
+endif
 
 # Apps
 PRODUCT_PACKAGES += \
diff --git a/config/scoop.mk b/config/scoop.mk
index cf756139..0c444837 100644
--- a/config/scoop.mk
+++ b/config/scoop.mk
@@ -10,6 +10,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     persist.sys.pihooks_FINGERPRINT?=google/oriole_beta/oriole:16/BP22.250221.015/13278879:user/release-keys \
     persist.sys.pihooks_MODEL?=Pixel 6
 
+#BUILD_GMS_OVERLAYS_AND_PROPS := true
 $(call inherit-product, vendor/gms/products/gms.mk)
 
--include vendor/scoop-priv/keys/keys.mk
+-include vendor/lineage-priv/keys/keys.mk
diff --git a/config/telephony.mk b/config/telephony.mk
index 0c6ebba8..2fc7d4cf 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -17,8 +17,10 @@ PRODUCT_PACKAGES += \
     Stk
 
 # Default ringtone
+ifneq ($(WITH_GMS),true)
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.config.ringtone=Orion.ogg
+endif
 
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)