diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 7333e97..35d3a13 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -81,6 +81,7 @@ BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 114898743296
+BOARD_USES_METADATA_PARTITION := true
 
 PARTITIONS_LIST := system vendor
 
diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 6b3c986..bcb2958 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -14,6 +14,7 @@
 /dev/block/by-name/vendor                               /vendor                  ext4    ro,barrier=1,discard                                 wait,avb,first_stage_mount
 
 /dev/block/bootdevice/by-name/cache                     /cache                   ext4    nosuid,noatime,nodev,barrier=1                       wait
+/dev/block/by-name/logdump                              /metadata                ext4    noatime,nosuid,nodev,discard                         wait,check,formattable,first_stage_mount
 /dev/block/bootdevice/by-name/userdata                  /data                    ext4    noatime,nosuid,noatime,nodev,barrier=1,noauto_da_alloc,lazytime       wait,check,fileencryption=ice,quota,reservedsize=128M
 
 /dev/block/bootdevice/by-name/bluetooth                 /vendor/bt_firmware      vfat    ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index b976de5..e76236f 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -2,6 +2,10 @@
 /dev/socket/audio_hw_socket                                             u:object_r:audio_socket:s0
 /mnt/vendor/persist/audio(/.*)?                                         u:object_r:persist_audio_file:s0
 
+# Block devices
+/dev/block/platform/soc/1d84000.ufshc/by-name/logdump                   u:object_r:metadata_block_device:s0
+/dev/block/platform/soc/7c4000.sdhci/by-name/logdump                    u:object_r:metadata_block_device:s0
+
 # Camera
 /mnt/vendor/persist/camera(/.*)?                                        u:object_r:persist_camera_file:s0
 /vendor/bin/remosaic_daemon                                             u:object_r:remosaic_daemon_exec:s0