diff --git a/device.mk b/device.mk
index 2f32934..67c5ad5 100644
--- a/device.mk
+++ b/device.mk
@@ -173,8 +173,7 @@ PRODUCT_PACKAGES += \
     libgbm_mesa_wrapper
 
 PRODUCT_PACKAGES += \
-    android.hardware.graphics.composer@2.4-service \
-    hwcomposer.drm
+    android.hardware.composer.hwc3-service.drm
 
 PRODUCT_PACKAGES += \
     libEGL_mesa \
diff --git a/manifest.xml b/manifest.xml
index def221e..39e0b86 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -34,15 +34,6 @@
             <instance>legacy/0</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.tv.cec</name>
         <transport>hwbinder</transport>
diff --git a/vendor.prop b/vendor.prop
index aba70ea..91249cd 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -50,7 +50,6 @@ persist.ffmpeg_codec2.v4l2.h265=true
 
 # Graphics
 ro.hardware.egl=mesa
-ro.hardware.hwcomposer=drm
 ro.hardware.vulkan=broadcom
 ro.opengles.version=196609
 vendor.hwc.backend_override=rpi5