diff --git a/comet-sepolicy.mk b/comet-sepolicy.mk
index 32aa697..3ffaa05 100644
--- a/comet-sepolicy.mk
+++ b/comet-sepolicy.mk
@@ -1,2 +1,6 @@
 # sepolicy exclusively for comet.
 BOARD_SEPOLICY_DIRS += device/google/comet-sepolicy/vendor
+
+# system_ext
+SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += device/google/comet-sepolicy/system_ext/public
+SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/google/comet-sepolicy/system_ext/private
diff --git a/system_ext/private/gmscore_app.te b/system_ext/private/gmscore_app.te
new file mode 100644
index 0000000..4dc1639
--- /dev/null
+++ b/system_ext/private/gmscore_app.te
@@ -0,0 +1,2 @@
+# Allow to read setupwizard_feature_prop
+get_prop(gmscore_app, setupwizard_feature_prop)
diff --git a/system_ext/private/priv_app.te b/system_ext/private/priv_app.te
new file mode 100644
index 0000000..90bc371
--- /dev/null
+++ b/system_ext/private/priv_app.te
@@ -0,0 +1,2 @@
+# Allow to read setupwizard_feature_prop
+get_prop(priv_app, setupwizard_feature_prop)
diff --git a/system_ext/private/property_contexts b/system_ext/private/property_contexts
new file mode 100644
index 0000000..464a289
--- /dev/null
+++ b/system_ext/private/property_contexts
@@ -0,0 +1,2 @@
+# setupwizard
+setupwizard.feature.provisioning_profile_mode    u:object_r:setupwizard_feature_prop:s0
diff --git a/system_ext/public/property.te b/system_ext/public/property.te
new file mode 100644
index 0000000..96cb3b3
--- /dev/null
+++ b/system_ext/public/property.te
@@ -0,0 +1,2 @@
+# setupwizard
+system_public_prop(setupwizard_feature_prop)
diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts
index a99a07e..9f1faca 100644
--- a/vendor/genfs_contexts
+++ b/vendor/genfs_contexts
@@ -8,6 +8,7 @@ genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/panel_need_
 genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/op_hz                                u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19450000.drmdsim/hs_clock                                                u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/backlight                            u:object_r:sysfs_leds:s0
+genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/power_state                          u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/panel_extinfo                        u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/panel_name                           u:object_r:sysfs_display:s0
 genfscon sysfs /devices/platform/19450000.drmdsim/19450000.drmdsim.0/serial_number                        u:object_r:sysfs_display:s0
@@ -32,13 +33,8 @@ genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0036/power/wakeup
 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0036/power_supply/maxfg_secondary/power/wakeup  u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0036/power_supply/maxfg_secondary/wakeup        u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0036/wakeup                                     u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0061/power/wakeup                               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0061/power_supply/wireless/power/wakeup         u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0061/power_supply/wireless/wakeup               u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/10ca0000.hsi2c/i2c-10/10-0061/wakeup                                     u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/111c0000.spi/spi_master/spi19/spi19.0/synaptics_tcm.0/power/wakeup       u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/111c0000.spi/spi_master/spi19/spi19.0/synaptics_tcm.0/wakeup             u:object_r:sysfs_wakeup:s0
-genfscon sysfs /devices/platform/gnssif/wakeup                                                            u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply/dualbatt/power/wakeup                u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply/dualbatt/wakeup                      u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/odm/odm:fp_fpc1020/wakeup                                                u:object_r:sysfs_wakeup:s0
diff --git a/vendor/grilservice_app.te b/vendor/grilservice_app.te
new file mode 100644
index 0000000..792dae4
--- /dev/null
+++ b/vendor/grilservice_app.te
@@ -0,0 +1,2 @@
+allow grilservice_app gril_antenna_tuning_service:service_manager find;
+binder_call(grilservice_app, twoshay)
diff --git a/vendor/vendor_init.te b/vendor/vendor_init.te
index 91d16a9..0af5c8a 100644
--- a/vendor/vendor_init.te
+++ b/vendor/vendor_init.te
@@ -1,2 +1,5 @@
 # Camera vendor property
 set_prop(vendor_init, vendor_camera_debug_prop)
+
+# setupwizard
+set_prop(vendor_init, setupwizard_feature_prop)