diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc
index 2354c697..c784c54c 100644
--- a/conf/init.gs201.usb.rc
+++ b/conf/init.gs201.usb.rc
@@ -71,8 +71,7 @@ on early-boot
     # acm function for uwb
     mkdir /config/usb_gadget/g1/functions/acm.uwb0
 
-    # disable permission change. TODO (b/206902205): add back later
-    # setprop vendor.usb.functions.ready 1
+    setprop vendor.usb.functions.ready 1
 
 on boot
     write /config/usb_gadget/g1/bcdDevice 0x0510
diff --git a/usb/gadget/android.hardware.usb.gadget-service.rc b/usb/gadget/android.hardware.usb.gadget-service.rc
index 8ed8efb7..49979d90 100644
--- a/usb/gadget/android.hardware.usb.gadget-service.rc
+++ b/usb/gadget/android.hardware.usb.gadget-service.rc
@@ -1,8 +1,7 @@
-# TODO (b/206902205): remove root permission later
 service vendor.usb-gadget-hal-1-2 /vendor/bin/hw/android.hardware.usb.gadget-service
     class hal
-    user root
-    group root system shell mtp
+    user system
+    group system shell mtp
 
 on post-fs
     chown root system /sys/class/typec/port0/power_role