diff --git a/device.mk b/device.mk
index 752e963..b158152 100644
--- a/device.mk
+++ b/device.mk
@@ -360,7 +360,9 @@ PRODUCT_PACKAGES_DEBUG += \
 
 # USB
 PRODUCT_PACKAGES += \
-    android.hardware.usb-service.qti
+    android.hardware.usb-service.qti \
+    android.hardware.usb.gadget-service.qti \
+    usb_compositions.conf
 
 # Vendor service manager
 PRODUCT_PACKAGES += \
diff --git a/properties/vendor.prop b/properties/vendor.prop
index 7836595..d897578 100644
--- a/properties/vendor.prop
+++ b/properties/vendor.prop
@@ -182,7 +182,7 @@ vendor.usb.rmnet.inst.name=rmnet
 vendor.usb.rndis.func.name=gsi
 vendor.usb.product_string=Nothing Phone (1)
 vendor.usb.use_ffs_mtp=1
-vendor.usb.use_gadget_hal=0
+vendor.usb.use_gadget_hal=1
 
 # WiFi
 wifi.aware.interface=wifi-aware0