diff --git a/config/common.mk b/config/common.mk
index 83b8427..c25dc31 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -16,11 +16,6 @@
 $(call inherit-product-if-exists, vendor/extra/product.mk)
 
 # Adblock
-PRODUCT_PACKAGES += \
-    hosts.adblock \
-    hosts.adblock_symlink \
-    hosts.real
-
 PRODUCT_COPY_FILES += \
     vendor/leaf/etc/adblock/init.adblock.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.adblock.rc
 
diff --git a/etc/adblock/Android.bp b/etc/adblock/Android.bp
index 48d6d4c..27dd58c 100644
--- a/etc/adblock/Android.bp
+++ b/etc/adblock/Android.bp
@@ -34,6 +34,11 @@
 }
 
 prebuilt_etc {
-   name: "hosts.real",
+   name: "etc_hosts",
    src: "hosts",
+   filename: "hosts.real",
+   required: [
+       "hosts.adblock",
+       "hosts.adblock_symlink",
+   ],
 }