diff --git a/common.mk b/common.mk
index 3ae2021..4cf9fd9 100644
--- a/common.mk
+++ b/common.mk
@@ -499,11 +499,13 @@ PRODUCT_PACKAGES_DEBUG += \
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.3-service-qti \
+    android.hardware.usb.gadget@1.2-service-qti \
     libusbhost.vendor
 
 PRODUCT_PACKAGES += \
     init.qcom.usb.rc \
-    init.qcom.usb.sh
+    init.qcom.usb.sh \
+    usb_compositions.conf
 
 PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/usb/etc
 
diff --git a/properties/vendor.prop b/properties/vendor.prop
index 3c2e0d0..8ac40cd 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -218,7 +218,7 @@ vendor.usb.rmnet.func.name=gsi
 vendor.usb.rmnet.inst.name=rmnet
 vendor.usb.rndis.func.name=gsi
 vendor.usb.use_ffs_mtp=1
-vendor.usb.use_gadget_hal=0
+vendor.usb.use_gadget_hal=1
 
 # WiFi
 wifi.aware.interface=wifi-aware0
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index f6ceea8..f9ee354 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -133,7 +133,6 @@ on charger
     start vendor.power_off_alarm
     setprop sys.usb.controller a600000.dwc3
     wait /sys/class/udc/${sys.usb.controller}
-    setprop sys.usb.configfs 1
     write /sys/kernel/cnss/charger_mode 1
 
 #service vendor.lowi /vendor/bin/sscrpcd