diff --git a/arm/Android.bp b/arm/Android.bp
index 775b06d..d8a7c8e 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -42,6 +42,19 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index c56210b..a5e1f57 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -29,6 +29,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     MarkupGoogle \
+    SetupWizardPrebuilt \
     Velvet
 endif
 
diff --git a/arm/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/arm/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
new file mode 100755
index 0000000..7309a03
Binary files /dev/null and b/arm/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk differ
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 1df5d41..0d39bc3 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -42,6 +42,19 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 67f81a2..f6a7a5b 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -30,6 +30,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     MarkupGoogle \
+    SetupWizardPrebuilt \
     Velvet
 endif
 
diff --git a/common/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/arm64/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
similarity index 52%
rename from common/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
rename to arm64/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
index 2208728..cb27dd3 100644
Binary files a/common/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk and b/arm64/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk differ
diff --git a/common/Android.bp b/common/Android.bp
index 3ed40df..8e61b8f 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -131,16 +131,3 @@ android_app_import {
 	product_specific: true,
 }
 
-android_app_import {
-	name: "SetupWizardPrebuilt",
-	owner: "gapps",
-	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
-	overrides: ["Provision"],
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	product_specific: true,
-}
-
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index e15db35..cc00a71 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -39,6 +39,5 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
-    AndroidMigratePrebuilt \
-    SetupWizardPrebuilt
+    AndroidMigratePrebuilt
 endif
diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt
index c5385e1..61d3923 100644
--- a/proprietary-files-arm-nongrouper.txt
+++ b/proprietary-files-arm-nongrouper.txt
@@ -1,3 +1,4 @@
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|77dbc6656fc920e0d89b9ac8cffdd60250a45ff0
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|29900224869ef94c1fffa1cab31bc8260d86a736
 product/app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db
diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt
index 5d3e50c..8f93e65 100644
--- a/proprietary-files-arm64-nongrouper.txt
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -1,3 +1,4 @@
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|074346bfb2128d64049b373e447837a300a4054f
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|d6321f135f7f0f503d37bb1ee3f8c1dbae6d2b9c
 product/app/MarkupGoogle/lib/arm64/libsketchology_native.so|5c55b4d32beeeca04b4e9f4ce1a2cd3e15a32c8c
diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt
index 144c0ea..17032ed 100644
--- a/proprietary-files-common-nongrouper.txt
+++ b/proprietary-files-common-nongrouper.txt
@@ -1,2 +1 @@
 -product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc
--product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED
diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt
index c51e846..9e957ac 100644
--- a/proprietary-files-x86-nongrouper.txt
+++ b/proprietary-files-x86-nongrouper.txt
@@ -1 +1,2 @@
+-product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|3deb4081593c68ad034b3b8399b3dc8a7e8c4b12
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|09bd04fac0b341bfcad00778438f1cee652dc5ee
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 0cacb68..3d408a3 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -53,9 +53,6 @@ echo "endif" >> "$PRODUCTMK"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 
-# Make Google SuW override Provision
-sed -i 's/\(SetupWizardPrebuilt.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
-
 # We are done with common
 write_footers
 
@@ -79,6 +76,9 @@ printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)"
 
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 
+# Make Google SuW override Provision
+sed -i 's/\(SetupWizardPrebuilt.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
+
 # We are done with target
 write_footers
 
diff --git a/x86/Android.bp b/x86/Android.bp
index 403017c..97c6271 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -31,6 +31,19 @@ android_app_import {
 	product_specific: true,
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",
diff --git a/x86/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/x86/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
new file mode 100644
index 0000000..eb779dd
Binary files /dev/null and b/x86/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk differ
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
index bea8042..535fb43 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -26,6 +26,7 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
+    SetupWizardPrebuilt \
     Velvet
 endif