diff --git a/BoardConfig.mk b/BoardConfig.mk
index 78ca3099..0d9a1755 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -65,7 +65,7 @@ TARGET_COPY_OUT_VENDOR := vendor
 # Install odex files into the other system image
 BOARD_USES_SYSTEM_OTHER_ODEX := true
 
-BOARD_ROOT_EXTRA_FOLDERS := persist firmware
+BOARD_ROOT_EXTRA_FOLDERS := persist firmware metadata
 
 BOARD_SEPOLICY_DIRS += device/google/wahoo/sepolicy
 
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 9b9644a9..6ee97b11 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -270,3 +270,7 @@
 /persist/data(/.*)?       u:object_r:persist_data_file:s0
 /persist/display(/.*)?    u:object_r:persist_display_file:s0
 /persist/sensors(/.*)?    u:object_r:persist_sensors_file:s0
+
+/metadata                 u:object_r:rootfs:s0
+/metadata/.*              u:object_r:vold_data_file:s0
+