diff --git a/host/commands/assemble_cvd/Android.bp b/host/commands/assemble_cvd/Android.bp
index e296526..18e42f5 100644
--- a/host/commands/assemble_cvd/Android.bp
+++ b/host/commands/assemble_cvd/Android.bp
@@ -65,8 +65,7 @@
     defaults: ["cuttlefish_host_only", "cuttlefish_libicuuc"],
 }
 
-cc_prebuilt_binary {
+sh_binary_host {
     name: "cf_bpttool",
-    srcs: ["cf_bpttool"],
-    defaults: ["cuttlefish_host_only"],
+    src: "cf_bpttool",
 }
diff --git a/host/libs/vm_manager/Android.bp b/host/libs/vm_manager/Android.bp
index 6c638ea..eadcb12 100644
--- a/host/libs/vm_manager/Android.bp
+++ b/host/libs/vm_manager/Android.bp
@@ -38,8 +38,7 @@
     defaults: ["cuttlefish_host_only"],
 }
 
-cc_prebuilt_binary {
+sh_binary_host {
     name: "cf_qemu.sh",
-    srcs: ["cf_qemu.sh"],
-    defaults: ["cuttlefish_host_only"],
+    src: "cf_qemu.sh",
 }