diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index fd824751..6f8b43bc 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -246,7 +246,7 @@ endif
 #BOARD_USE_SOUNDTRIGGER_HAL := false
 
 # HWComposer
-BOARD_HWC_VERSION := libhwc2.1
+BOARD_HWC_VERSION := hwc3
 TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false
 BOARD_HDMI_INCAPABLE := true
 TARGET_USES_HWC2 := true
diff --git a/device.mk b/device.mk
index c80a75e4..7d804068 100644
--- a/device.mk
+++ b/device.mk
@@ -595,11 +595,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 	debug.slsi_platform=1 \
 	debug.hwc.winupdate=1
 
-# hw composer HAL
-PRODUCT_PACKAGES += \
-	libdisplaycolor \
-	hwcomposer.$(TARGET_BOARD_PLATFORM)
-
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += displaycolor_service
 endif
@@ -769,8 +764,8 @@ PRODUCT_PACKAGES += \
 #	trusty_metricsd
 
 PRODUCT_PACKAGES += \
-	android.hardware.graphics.composer@2.4-impl \
-	android.hardware.graphics.composer@2.4-service
+	android.hardware.composer.hwc3-service.pixel \
+	libdisplaycolor
 
 # Storage: for factory reset protection feature
 PRODUCT_PROPERTY_OVERRIDES += \