diff --git a/Android.bp b/Android.bp
index c2ab30c..dfecee0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,3 @@
 soong_namespace {
-    imports: ["hardware/qcom/bootctrl"],
+    imports: ["hardware/qcom-caf/bootctrl"],
 }
diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
index fdafd53..4b298a3 100644
--- a/bootctrl/Android.bp
+++ b/bootctrl/Android.bp
@@ -19,3 +19,10 @@ cc_library {
     defaults: ["bootctrl_hal_defaults"],
     static_libs: ["libgptutils.oneplus_kona"],
 }
+
+cc_library_shared {
+    name: "android.hardware.boot@1.1-impl-qti",
+    stem: "android.hardware.boot@1.0-impl-1.1-qti",
+    defaults: ["android.hardware.boot@1.1-impl-qti_defaults"],
+    static_libs: ["libgptutils.oneplus_kona"],
+}
diff --git a/common.mk b/common.mk
index c5e99a3..2151c9f 100644
--- a/common.mk
+++ b/common.mk
@@ -182,8 +182,8 @@ PRODUCT_PACKAGES += \
 
 # Boot control
 PRODUCT_PACKAGES += \
-    android.hardware.boot@1.1-impl \
-    android.hardware.boot@1.1-impl.recovery \
+    android.hardware.boot@1.1-impl-qti \
+    android.hardware.boot@1.1-impl-qti.recovery \
     android.hardware.boot@1.1-service \
     bootctrl.kona \
     bootctrl.kona.recovery