diff --git a/common.mk b/common.mk
index 63ac10d..bdb3476 100644
--- a/common.mk
+++ b/common.mk
@@ -35,6 +35,13 @@
     checkpoint_gc \
     otapreopt_script
 
+# Boot control
+PRODUCT_PACKAGES += \
+    android.hardware.boot-service.qti \
+    android.hardware.boot-service.qti.recovery
+
+$(call soong_config_set, ufsbsg, ufsframework, bsg)
+
 # Shipping API Level
 BOARD_SHIPPING_API_LEVEL := 33