diff --git a/arm/Android.bp b/arm/Android.bp
index abdb7e0..c58d951 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -40,6 +40,18 @@ android_app_import {
 	},
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index 9313763..8f15ffe 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -28,6 +28,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     MarkupGoogle \
+    SetupWizardPrebuilt \
     Velvet
 endif
 
diff --git a/arm/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/arm/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
new file mode 100644
index 0000000..b441607
Binary files /dev/null and b/arm/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk differ
diff --git a/arm64/Android.bp b/arm64/Android.bp
index abdb7e0..c58d951 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -40,6 +40,18 @@ android_app_import {
 	},
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 7c7bbae..6ea6ef0 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -29,6 +29,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_PACKAGES += \
     MarkupGoogle \
+    SetupWizardPrebuilt \
     Velvet
 endif
 
diff --git a/arm64/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/arm64/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
new file mode 100644
index 0000000..8adf4c2
Binary files /dev/null and b/arm64/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk differ
diff --git a/common/Android.bp b/common/Android.bp
index c60a667..136cc5f 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -116,15 +116,3 @@ android_app_import {
 	privileged: true,
 }
 
-android_app_import {
-	name: "SetupWizardPrebuilt",
-	owner: "gapps",
-	apk: "proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
-	overrides: ["Provision"],
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-}
-
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index f9a0553..b9c9d14 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -40,6 +40,5 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
-    AndroidMigratePrebuilt \
-    SetupWizardPrebuilt
+    AndroidMigratePrebuilt
 endif
diff --git a/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
deleted file mode 100644
index 3ea8c76..0000000
Binary files a/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk and /dev/null differ
diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt
index 0b4494a..2ab6f9c 100644
--- a/proprietary-files-arm-nongrouper.txt
+++ b/proprietary-files-arm-nongrouper.txt
@@ -1,3 +1,4 @@
 -app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|3656ccfa12fd73e6f130e947e4fd1699c9e5be12
 -priv-app/Velvet/Velvet.apk;PRESIGNED|1bd57d7a32d77ec007ca7ad8032cca8d9038c555
 app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db
diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt
index 48ccd0d..7dbe02d 100644
--- a/proprietary-files-arm64-nongrouper.txt
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -1,3 +1,4 @@
 -app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
+-priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|d7756e156c070b0acabe76c0df74229d5a25ab29
 -priv-app/Velvet/Velvet.apk;PRESIGNED|314043242c4253b61d9d4fcf656489d3fa0265be
 app/MarkupGoogle/lib/arm64/libsketchology_native.so|71898873b8d07af8f0589ac6faf64770300b2e21
diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt
index c28bcd8..6a3f225 100644
--- a/proprietary-files-common-nongrouper.txt
+++ b/proprietary-files-common-nongrouper.txt
@@ -1,2 +1 @@
 -priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc
--priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED
diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt
index 428dd64..f6201e5 100644
--- a/proprietary-files-x86-nongrouper.txt
+++ b/proprietary-files-x86-nongrouper.txt
@@ -1 +1,2 @@
+-priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED|6032fa4174bf17062099c3dded3a2f22c9c51bf3
 -priv-app/Velvet/Velvet.apk;PRESIGNED|cd13e9ea9d5b3337b8a22b9ea7939132458cbced
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 4948b22..fba612b 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -52,9 +52,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
 
@@ -77,6 +74,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 66401e9..e82c803 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -30,6 +30,18 @@ android_app_import {
 	privileged: true,
 }
 
+android_app_import {
+	name: "SetupWizardPrebuilt",
+	owner: "gapps",
+	apk: "proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+}
+
 android_app_import {
 	name: "Velvet",
 	owner: "gapps",
diff --git a/x86/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/x86/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk
new file mode 100644
index 0000000..6cd3989
Binary files /dev/null and b/x86/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk differ
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
index d8c73bc..18c1082 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -25,6 +25,7 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
+    SetupWizardPrebuilt \
     Velvet
 endif