diff --git a/properties.mk b/properties.mk
index 1564e3f..443bc83 100644
--- a/properties.mk
+++ b/properties.mk
@@ -408,7 +408,13 @@ sys.vendor.shutdown.waittime=500
 # USB
 PRODUCT_VENDOR_PROPERTIES += \
 vendor.usb.diag.func.name=diag \
-vendor.usb.use_ffs_mtp=0
+vendor.usb.dpl.inst.name=dpl \
+vendor.usb.qdss.inst.name=qdss \
+vendor.usb.rmnet.func.name=gsi \
+vendor.usb.rmnet.inst.name=rmnet \
+vendor.usb.rndis.func.name=gsi \
+vendor.usb.use_ffs_mtp=0 \
+vendor.usb.use_gadget_hal=0
 
 # Volume steps
 PRODUCT_VENDOR_PROPERTIES += \