diff --git a/device.mk b/device.mk
index 67c5ad5..9431f67 100644
--- a/device.mk
+++ b/device.mk
@@ -168,8 +168,8 @@ PRODUCT_PACKAGES += \
 
 # Graphics
 PRODUCT_PACKAGES += \
-    android.hardware.graphics.allocator@4.0-service.minigbm_gbm_mesa \
-    android.hardware.graphics.mapper@4.0-impl.minigbm_gbm_mesa \
+    android.hardware.graphics.allocator-service.minigbm_gbm_mesa \
+    mapper.minigbm_gbm_mesa \
     libgbm_mesa_wrapper
 
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 63f728f..e220a4a 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -22,8 +22,8 @@
 /dev/dri/card1                                                                          u:object_r:gpu_device:s0
 /dev/dri/renderD128                                                                     u:object_r:gpu_device:s0
 /vendor/bin/hw/android\.hardware\.composer\.hwc3-service\.drm                           u:object_r:hal_graphics_composer_default_exec:s0
-/vendor/bin/hw/android\.hardware\.graphics\.allocator@4\.0-service\.minigbm_gbm_mesa    u:object_r:hal_graphics_allocator_default_exec:s0
-/vendor/lib(64)?/hw/android\.hardware\.graphics.mapper@4\.0-impl\.minigbm_gbm_mesa\.so  u:object_r:same_process_hal_file:s0
+/vendor/bin/hw/android\.hardware\.graphics\.allocator-service\.minigbm_gbm_mesa         u:object_r:hal_graphics_allocator_default_exec:s0
+/vendor/lib(64)?/hw/mapper\.minigbm_gbm_mesa\.so                                        u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/hw/vulkan\.broadcom\.so                                                u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/dri_gbm\.so                                                            u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libdrm\.so                                                             u:object_r:same_process_hal_file:s0
@@ -32,6 +32,7 @@
 /vendor/lib{64}?/libgbm_mesa_wrapper\.so                                                u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libglapi\.so                                                           u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/libminigbm_gralloc_gbm_mesa\.so                                        u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libminigbm_gralloc4_utils_gbm_mesa\.so                                 u:object_r:same_process_hal_file:s0
 
 # Health
 /vendor/bin/hw/android\.hardware\.health-service\.rpi                        u:object_r:hal_health_default_exec:s0
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index 0b26888..0638150 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -1 +1,2 @@
 android.hardware.drm.IDrmFactory/widevine                                    u:object_r:hal_drm_service:s0
+mapper/minigbm_gbm_mesa                                                      u:object_r:hal_graphics_mapper_service:s0