diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt
index 33a0209..08b2985 100644
--- a/proprietary-files-arm-nongrouper.txt
+++ b/proprietary-files-arm-nongrouper.txt
@@ -1,6 +1,6 @@
 -product/app/GoogleTTS/GoogleTTS.apk;PRESIGNED|a683e05e6ed20c293c73e8e745253c6c89adf955
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
 -product/app/talkback/talkback.apk;PRESIGNED|be748ca431a2d8ceeafa3e324fe98a4454eebeb8
--product/priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|52d65ce2850c8d29435fb18a60d3ff1f16d38461
+-product/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|52d65ce2850c8d29435fb18a60d3ff1f16d38461
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|bd42dd08db4d31e09be910544d7570993c2f560c
 product/app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db
diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt
index e104b69..9a35b92 100644
--- a/proprietary-files-arm64-nongrouper.txt
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -1,6 +1,6 @@
 -product/app/GoogleTTS/GoogleTTS.apk;PRESIGNED|89f25ee81c8bd93b8a788fa2b4a7c56d8ecfad92
 -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f
 -product/app/talkback/talkback.apk;PRESIGNED|3919b84d1975ee664289beb8a0d683fa312ed5a0
--product/priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|691e4c76521fa0e47005c37d0b70094a74a855f3
+-product/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|691e4c76521fa0e47005c37d0b70094a74a855f3
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|2afe5f811617cd293d24478f8702b6ab4b99251c
 product/app/MarkupGoogle/lib/arm64/libsketchology_native.so|5c55b4d32beeeca04b4e9f4ce1a2cd3e15a32c8c
diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt
index bbb8f53..6469272 100644
--- a/proprietary-files-x86-nongrouper.txt
+++ b/proprietary-files-x86-nongrouper.txt
@@ -1,2 +1,2 @@
--product/priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|cae5849fdd55cf7ef4a7fde1a180ab8fb2cf8dfd
+-product/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|cae5849fdd55cf7ef4a7fde1a180ab8fb2cf8dfd
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|131f57f1c772e1c08078e161e6ba5a7f79ed022f
diff --git a/proprietary-files-x86_64-nongrouper.txt b/proprietary-files-x86_64-nongrouper.txt
index 6c37c12..b40f7af 100644
--- a/proprietary-files-x86_64-nongrouper.txt
+++ b/proprietary-files-x86_64-nongrouper.txt
@@ -1,2 +1,2 @@
--product/priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|ef984a31dfe60c86b7c833835b71f62505582fb3
+-product/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED|ef984a31dfe60c86b7c833835b71f62505582fb3
 -product/priv-app/Velvet/Velvet.apk;PRESIGNED|f42b6c8809feb12f0a435737258bc63feccfd3ce
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index a9ba31f..b007e7e 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -74,9 +74,6 @@ 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/\(SetupWizard.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP"
-
 # We are done with target
 write_footers