diff --git a/arm/Android.mk b/arm/Android.mk
index 582c7c3..3f5772a 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(TARGET_DEVICE),)
+ifeq ($(TARGET_DEVICE),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore
@@ -30,16 +30,4 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := SetupWizard
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/SetupWizard/SetupWizard.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
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index a5904af..fb75c87 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -18,7 +18,6 @@ PRODUCT_COPY_FILES += \
     vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
-    PrebuiltGmsCore \
-    SetupWizard
+    PrebuiltGmsCore
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)
diff --git a/arm/proprietary/priv-app/SetupWizard/SetupWizard.apk b/arm/proprietary/priv-app/SetupWizard/SetupWizard.apk
deleted file mode 100644
index cce0610..0000000
Binary files a/arm/proprietary/priv-app/SetupWizard/SetupWizard.apk and /dev/null differ
diff --git a/arm64/Android.mk b/arm64/Android.mk
index c7e9ae8..3f5772a 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -30,16 +30,4 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := SetupWizard
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/SetupWizard/SetupWizard.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
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 6e3a1b2..556025e 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -19,7 +19,6 @@ PRODUCT_COPY_FILES += \
     vendor/gapps/arm64/proprietary/lib64/libjni_latinimegoogle.so:system/lib64/libjni_latinimegoogle.so
 
 PRODUCT_PACKAGES += \
-    PrebuiltGmsCore \
-    SetupWizard
+    PrebuiltGmsCore
 
 $(call inherit-product, vendor/gapps/common/common-vendor.mk)
diff --git a/common-proprietary-files.txt b/common-proprietary-files.txt
index ccf22a4..e37f9bd 100644
--- a/common-proprietary-files.txt
+++ b/common-proprietary-files.txt
@@ -10,6 +10,7 @@
 -priv-app/GooglePartnerSetup/GooglePartnerSetup.apk:PRESIGNED
 -priv-app/GoogleServicesFramework/GoogleServicesFramework.apk:PRESIGNED
 -priv-app/Phonesky/Phonesky.apk:PRESIGNED
+-priv-app/SetupWizard/SetupWizard.apk:PRESIGNED
 
 -framework/com.google.android.maps.jar:PRESIGNED
 -framework/com.google.android.media.effects.jar:PRESIGNED
diff --git a/common/Android.mk b/common/Android.mk
index d88f3f2..739dc62 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -148,6 +148,18 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := SetupWizard
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/SetupWizard/SetupWizard.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)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := com.google.android.maps
 LOCAL_MODULE_OWNER := gapps
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 5747d37..71479de 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -35,6 +35,7 @@ PRODUCT_PACKAGES += \
     GooglePartnerSetup \
     GoogleServicesFramework \
     Phonesky \
+    SetupWizard \
     com.google.android.maps \
     com.google.android.media.effects \
     com.google.widevine.software.drm
diff --git a/arm64/proprietary/priv-app/SetupWizard/SetupWizard.apk b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk
similarity index 100%
rename from arm64/proprietary/priv-app/SetupWizard/SetupWizard.apk
rename to common/proprietary/priv-app/SetupWizard/SetupWizard.apk
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 0d780e9..38c807d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,2 +1 @@
 -priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk:PRESIGNED
--priv-app/SetupWizard/SetupWizard.apk:PRESIGNED