diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp
index d62cfb2..0746a24 100644
--- a/bootctrl/Android.bp
+++ b/bootctrl/Android.bp
@@ -4,9 +4,14 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-cc_library_shared {
-    name: "android.hardware.boot@1.2-impl-qti",
-    stem: "android.hardware.boot@1.0-impl-1.2-qti",
-    defaults: ["android.hardware.boot@1.2-impl-qti_defaults"],
+cc_binary {
+    name: "android.hardware.boot-service.qti",
+    defaults: ["android.hardware.boot-service.qti_defaults"],
+    static_libs: ["libgptutils.nothing"],
+}
+
+cc_binary {
+    name: "android.hardware.boot-service.qti.recovery",
+    defaults: ["android.hardware.boot-service.qti.recovery_defaults"],
     static_libs: ["libgptutils.nothing"],
 }
diff --git a/device.mk b/device.mk
index 9711774..12db0fc 100644
--- a/device.mk
+++ b/device.mk
@@ -177,9 +177,8 @@ PRODUCT_COPY_FILES += \
 
 # Boot control
 PRODUCT_PACKAGES += \
-    android.hardware.boot@1.2-impl-qti \
-    android.hardware.boot@1.2-impl-qti.recovery \
-    android.hardware.boot@1.2-service
+    android.hardware.boot-service.qti \
+    android.hardware.boot-service.qti.recovery
 
 # Camera
 PRODUCT_PACKAGES += \