diff --git a/config.mk b/config.mk
index 241a4e0..339bbb2 100644
--- a/config.mk
+++ b/config.mk
@@ -6,6 +6,7 @@ include vendor/custom/fonts/fonts.mk
 # Include prebuilts packages
 include vendor/custom/prebuilts/prebuilts.mk
 RELAX_USES_LIBRARY_CHECK=true
+BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES=true
 
 TARGET_EXCLUDE_PACKAGES += \
     Seedvault \
diff --git a/prebuilts/Android.bp b/prebuilts/Android.bp
new file mode 100644
index 0000000..6dbc1d8
--- /dev/null
+++ b/prebuilts/Android.bp
@@ -0,0 +1,22 @@
+soong_namespace {
+	imports: [
+	],
+}
+
+cc_prebuilt_binary {
+    name: "wg",
+    srcs: ["product/bin/wg"],
+    installable: true,
+}
+
+cc_prebuilt_binary {
+    name: "wg-quick",
+    srcs: ["product/bin/wg-quick"],
+    installable: true,
+}
+
+cc_prebuilt_binary {
+    name: "vim",
+    srcs: ["product/bin/vim"],
+    installable: true,
+}
diff --git a/prebuilts/prebuilts.mk b/prebuilts/prebuilts.mk
index 2bbd886..df4d181 100644
--- a/prebuilts/prebuilts.mk
+++ b/prebuilts/prebuilts.mk
@@ -1,2 +1 @@
 # Copy files
-PRODUCT_COPY_FILES += $(call find-copy-subdir-files,*,vendor/custom/prebuilts/product/bin,$(TARGET_COPY_OUT_PRODUCT)/bin)