diff --git a/arm/Android.mk b/arm/Android.mk
index 0690be7..3d0e0ad 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -30,4 +30,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := Velvet
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PREBUILT)
+
+endif
 endif
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index c92dcaa..bd32be9 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -19,5 +19,10 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
+ifeq ($(TARGET_IS_GROUPER),)
+
+PRODUCT_PACKAGES += \
+    Velvet
+endif
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)
diff --git a/arm/proprietary/priv-app/Velvet/Velvet.apk b/arm/proprietary/priv-app/Velvet/Velvet.apk
new file mode 100644
index 0000000..510e039
Binary files /dev/null and b/arm/proprietary/priv-app/Velvet/Velvet.apk differ
diff --git a/arm64/Android.mk b/arm64/Android.mk
index bc8f91a..c84c48a 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -30,4 +30,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := Velvet
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PREBUILT)
+
+endif
 endif
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index b3621fb..84fdd90 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -20,5 +20,10 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
+ifeq ($(TARGET_IS_GROUPER),)
+
+PRODUCT_PACKAGES += \
+    Velvet
+endif
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)
diff --git a/arm64/proprietary/priv-app/Velvet/Velvet.apk b/arm64/proprietary/priv-app/Velvet/Velvet.apk
new file mode 100644
index 0000000..8f3e80c
Binary files /dev/null and b/arm64/proprietary/priv-app/Velvet/Velvet.apk differ
diff --git a/common/Android.mk b/common/Android.mk
index 3e974d4..0655817 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -169,17 +169,5 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := Velvet
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
 endif
 endif
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 72c8f29..87a78da 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -37,6 +37,5 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
-    SetupWizard \
-    Velvet
+    SetupWizard
 endif
diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt
new file mode 100644
index 0000000..5790f58
--- /dev/null
+++ b/proprietary-files-arm-nongrouper.txt
@@ -0,0 +1 @@
+-priv-app/Velvet/Velvet.apk;PRESIGNED|bb33e5804f384a2e446b66d2e73b9136b41c9e0c
diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt
new file mode 100644
index 0000000..0518b24
--- /dev/null
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -0,0 +1 @@
+-priv-app/Velvet/Velvet.apk;PRESIGNED|c91bb78c79a335a1786d95800fadb11fe1e1261b
diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt
index 18a1212..5a0b3c6 100644
--- a/proprietary-files-common-nongrouper.txt
+++ b/proprietary-files-common-nongrouper.txt
@@ -1,2 +1 @@
 -priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
--priv-app/Velvet/Velvet.apk;PRESIGNED
diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt
new file mode 100644
index 0000000..f6fe7de
--- /dev/null
+++ b/proprietary-files-x86-nongrouper.txt
@@ -0,0 +1 @@
+-priv-app/Velvet/Velvet.apk;PRESIGNED|d69d0ca0844fe8d794111fa1d836be85a48208c2
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 376559d..f1b027f 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -70,6 +70,13 @@ write_headers "$TARGET"
 
 write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
 
+# Gapps that are too large for grouper
+echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
+echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK"
+write_makefiles "$MY_DIR"/proprietary-files-$TARGET-nongrouper.txt
+echo "endif" >> "$PRODUCTMK"
+echo "endif" >> "$ANDROIDMK"
+
 printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
diff --git a/x86/Android.mk b/x86/Android.mk
index ae8f13b..c9a0492 100644
--- a/x86/Android.mk
+++ b/x86/Android.mk
@@ -30,4 +30,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := Velvet
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PREBUILT)
+
+endif
 endif
diff --git a/common/proprietary/priv-app/Velvet/Velvet.apk b/x86/proprietary/priv-app/Velvet/Velvet.apk
similarity index 80%
rename from common/proprietary/priv-app/Velvet/Velvet.apk
rename to x86/proprietary/priv-app/Velvet/Velvet.apk
index 368fa3b..10e0f5a 100644
Binary files a/common/proprietary/priv-app/Velvet/Velvet.apk and b/x86/proprietary/priv-app/Velvet/Velvet.apk differ
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
index 53a32b3..f758d31 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -19,5 +19,10 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     PrebuiltGmsCore
+ifeq ($(TARGET_IS_GROUPER),)
+
+PRODUCT_PACKAGES += \
+    Velvet
+endif
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)