diff --git a/apps/GoogleApps.mk b/apps/GoogleApps.mk
index b8d15e2..3a696a1 100644
--- a/apps/GoogleApps.mk
+++ b/apps/GoogleApps.mk
@@ -38,6 +38,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     FlipendoPrebuilt \
     GoogleExtServicesMobile \
+    MarkupGoogle \
     NexusLauncherRelease \
     PixelSetupWizard \
     PixelSetupWizardOverlay \
@@ -46,11 +47,10 @@ PRODUCT_PACKAGES += \
     WallpaperPickerGooglePrebuilt
 
 ## Extra packages
-#ifneq ($(WITH_GMS_MINIMAL),true)
+ifneq ($(GMS_MAKEFILE),gms_minimal.mk)
 PRODUCT_PACKAGES += \
-    MarkupGoogle \
     RecorderPrebuilt
-#endif
+endif
 
 ## Privledged App Permissions
 # Not split to account for the fact these apps are put in different locations by different GApps packages
diff --git a/product.mk b/product.mk
index d6af0d7..8893965 100644
--- a/product.mk
+++ b/product.mk
@@ -5,7 +5,7 @@ include vendor/google_pixel/apps/GoogleApps.mk
 
 ## Pixel Sounds
 # Don't build on devices with limited partition sizes
-#ifneq ($(WITH_GMS_MINIMAL),true)
+#ifneq ($(GMS_MAKEFILE),gms_minimal.mk)
 include vendor/google_pixel/sounds/GoogleAudio.mk
 #endif