diff --git a/BoardConfig.mk b/BoardConfig.mk
index 32331d3..04e7415 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2022 The LineageOS Project
+# Copyright (C) 2018-2024 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -29,7 +29,7 @@ TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 
 # Recovery
-TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom
+TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/init/fstab.qcom
 
 # Inherit from the proprietary version
 include vendor/xiaomi/polaris/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index bd3ff88..f55bf69 100644
--- a/device.mk
+++ b/device.mk
@@ -57,7 +57,8 @@ PRODUCT_COPY_FILES += \
 
 # Device fstab
 PRODUCT_PACKAGES += \
-    fstab.qcom
+    fstab.qcom \
+    fstab.qcom.ramdisk
 
 # Device init scripts
 PRODUCT_PACKAGES += \
diff --git a/init/Android.bp b/init/Android.bp
new file mode 100644
index 0000000..a00c2e9
--- /dev/null
+++ b/init/Android.bp
@@ -0,0 +1,18 @@
+//
+// Copyright (C) 2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+prebuilt_etc {
+    name: "fstab.qcom",
+    src: "fstab.qcom",
+    soc_specific: true,
+    ramdisk_available: true,
+}
+
+prebuilt_etc {
+    name: "init.target.rc",
+    src: "init.target.rc",
+    sub_dir: "init/hw",
+    soc_specific: true,
+}
diff --git a/rootdir/etc/fstab.qcom b/init/fstab.qcom
similarity index 100%
rename from rootdir/etc/fstab.qcom
rename to init/fstab.qcom
diff --git a/rootdir/etc/init.target.rc b/init/init.target.rc
similarity index 100%
rename from rootdir/etc/init.target.rc
rename to init/init.target.rc
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
deleted file mode 100644
index a7eaa66..0000000
--- a/rootdir/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE        := fstab.qcom
-LOCAL_MODULE_TAGS   := optional
-LOCAL_MODULE_CLASS  := ETC
-LOCAL_SRC_FILES     := etc/fstab.qcom
-LOCAL_REQUIRED_MODULES := fstab.qcom_ramdisk
-LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR_ETC)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := fstab.qcom_ramdisk
-LOCAL_MODULE_STEM  := fstab.qcom
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/fstab.qcom
-LOCAL_MODULE_PATH  := $(TARGET_RAMDISK_OUT)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE        := init.target.rc
-LOCAL_MODULE_TAGS   := optional
-LOCAL_MODULE_CLASS  := ETC
-LOCAL_SRC_FILES     := etc/init.target.rc
-LOCAL_MODULE_PATH   := $(TARGET_OUT_VENDOR_ETC)/init/hw
-include $(BUILD_PREBUILT)