diff --git a/device-cheetah.mk b/device-cheetah.mk
index c42442b..aa71b56 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -358,3 +358,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 # Virtual fingerprint HAL
 PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example
+
+# Setup Wizard device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    setupwizard.feature.enable_quick_start_flow_for_debug=true \
diff --git a/device-panther.mk b/device-panther.mk
index c7f9b10..83ff517 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -341,3 +341,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 
 # Virtual fingerprint HAL
 PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example
+
+# Setup Wizard device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    setupwizard.feature.enable_quick_start_flow_for_debug=true \