diff --git a/device-husky.mk b/device-husky.mk
index 82b3b50..7523922 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -262,3 +262,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
         device/google/zuma/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
 endif
+
+# Setup Wizard device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    setupwizard.feature.enable_quick_start_flow=true \
+
diff --git a/device-shiba.mk b/device-shiba.mk
index 5fb3430..3725a84 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -256,3 +256,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \
         device/google/zuma/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
 endif
+
+# Setup Wizard device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    setupwizard.feature.enable_quick_start_flow=true \
+