diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 46d7625..16b1ef4 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -36,4 +36,4 @@ PRODUCT_PACKAGES += \
 endif
 
 PRODUCT_SOONG_NAMESPACES += vendor/gapps/overlay
-PRODUCT_PACKAGES += GmsOverlay GmsSettingsProviderOverlay
+PRODUCT_PACKAGES += GmsOverlay GmsSettingsProviderOverlay GmsSetupWizardOverlay
diff --git a/overlay/GmsSetupWizardOverlay/Android.bp b/overlay/GmsSetupWizardOverlay/Android.bp
new file mode 100644
index 0000000..21a1cc3
--- /dev/null
+++ b/overlay/GmsSetupWizardOverlay/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+    name: "GmsSetupWizardOverlay",
+    product_specific: true
+}
diff --git a/overlay/GmsSetupWizardOverlay/AndroidManifest.xml b/overlay/GmsSetupWizardOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..34f7447
--- /dev/null
+++ b/overlay/GmsSetupWizardOverlay/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mtg.gmssetupwizardoverlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.google.android.setupwizard" android:priority="1337" android:isStatic="true" />
+</manifest>
diff --git a/overlay/GmsSetupWizardOverlay/apktool.yml b/overlay/GmsSetupWizardOverlay/apktool.yml
new file mode 100644
index 0000000..874c633
--- /dev/null
+++ b/overlay/GmsSetupWizardOverlay/apktool.yml
@@ -0,0 +1,23 @@
+!!brut.androlib.apk.ApkInfo
+apkFileName: GmsSetupWizardOverlay.apk
+doNotCompress:
+- resources.arsc
+isFrameworkApk: false
+packageInfo:
+  forcedPackageId: '127'
+  renameManifestPackage: null
+resourcesAreCompressed: false
+sdkInfo:
+  minSdkVersion: '34'
+  targetSdkVersion: '34'
+sharedLibrary: false
+sparseResources: true
+unknownFiles: {}
+usesFramework:
+  ids:
+  - 1
+  tag: null
+version: 2.8.1
+versionInfo:
+  versionCode: '1'
+  versionName: '1.0'
diff --git a/overlay/GmsSetupWizardOverlay/res/values/bools.xml b/overlay/GmsSetupWizardOverlay/res/values/bools.xml
new file mode 100644
index 0000000..083f367
--- /dev/null
+++ b/overlay/GmsSetupWizardOverlay/res/values/bools.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="dynamic_color_enabled">true</bool>
+    <bool name="enable_partner_experiment">true</bool>
+    <bool name="enable_quick_enhanced_biometrics_flow">true</bool>
+    <bool name="extended_partner_config_enabled">true</bool>
+    <bool name="full_dynamic_color_enabled">true</bool>
+</resources>