diff --git a/product/audio.mk b/product/audio.mk
index 4d19396..81153d6 100644
--- a/product/audio.mk
+++ b/product/audio.mk
@@ -1,6 +1,7 @@
 # Audio HAL
 PRODUCT_PACKAGES += \
     android.hardware.audio@2.0-impl \
+    android.hardware.audio@2.0-service \
     android.hardware.audio.effect@2.0-impl \
     android.hardware.broadcastradio@1.0-impl \
     android.hardware.soundtrigger@2.0-impl
diff --git a/product/bluetooth.mk b/product/bluetooth.mk
index 3322cb1..6bdf57a 100644
--- a/product/bluetooth.mk
+++ b/product/bluetooth.mk
@@ -14,4 +14,5 @@ PRODUCT_PROPERTY_OVERRIDES += \
 # Bluetooth
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-impl \
+    android.hardware.bluetooth@1.0-service \
     libbt-vendor
diff --git a/product/camera.mk b/product/camera.mk
index fe85333..b4526fe 100644
--- a/product/camera.mk
+++ b/product/camera.mk
@@ -10,5 +10,6 @@ PRODUCT_PACKAGES += \
     camera.device@1.0-impl \
     camera.device@3.2-impl \
     android.hardware.camera.provider@2.4-impl \
+    android.hardware.camera.provider@2.4-service \
     vendor.qti.hardware.camera.device@1.0 \
     vendor.qti.hardware.camera.device@1.0_vendor
diff --git a/product/consumerir.mk b/product/consumerir.mk
index 7213a2f..4a0aba9 100644
--- a/product/consumerir.mk
+++ b/product/consumerir.mk
@@ -1,6 +1,7 @@
 # Consumerir HIDL
 PRODUCT_PACKAGES += \
-    android.hardware.ir@1.0-impl
+    android.hardware.ir@1.0-impl \
+    android.hardware.ir@1.0-service
 
 # Permissions
 PRODUCT_COPY_FILES += \
diff --git a/product/display.mk b/product/display.mk
index 3d7289d..c548900 100644
--- a/product/display.mk
+++ b/product/display.mk
@@ -24,8 +24,12 @@ PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \
     android.hardware.graphics.allocator@2.0-service \
     android.hardware.graphics.composer@2.1-impl \
+    android.hardware.graphics.composer@2.1-service \
     android.hardware.graphics.mapper@2.0-impl \
-    android.hardware.memtrack@1.0-impl
+    android.hardware.memtrack@1.0-impl \
+    android.hardware.memtrack@1.0-service \
+    vendor.display.config@1.0 \
+    vendor.display.config@1.0_vendor
 
 # Permissions
 PRODUCT_COPY_FILES += \
diff --git a/product/drm.mk b/product/drm.mk
index 0696dc3..185bf1e 100644
--- a/product/drm.mk
+++ b/product/drm.mk
@@ -1,3 +1,4 @@
 # DRM
 PRODUCT_PACKAGES += \
-    android.hardware.drm@1.0-impl
+    android.hardware.drm@1.0-impl \
+    android.hardware.drm@1.0-service
diff --git a/product/gatekeeper.mk b/product/gatekeeper.mk
index 800a651..425d53c 100644
--- a/product/gatekeeper.mk
+++ b/product/gatekeeper.mk
@@ -1,3 +1,4 @@
 # Gatekeeper HAL
 PRODUCT_PACKAGES += \
-    android.hardware.gatekeeper@1.0-impl
+    android.hardware.gatekeeper@1.0-impl \
+    android.hardware.gatekeeper@1.0-service
diff --git a/product/keymaster.mk b/product/keymaster.mk
index e86ee53..9848977 100644
--- a/product/keymaster.mk
+++ b/product/keymaster.mk
@@ -1,3 +1,4 @@
 # Keymaster HAL
 PRODUCT_PACKAGES += \
-    android.hardware.keymaster@3.0-impl
+    android.hardware.keymaster@3.0-impl \
+    android.hardware.keymaster@3.0-service
diff --git a/product/lights.mk b/product/lights.mk
index 87a88cb..8363dba 100644
--- a/product/lights.mk
+++ b/product/lights.mk
@@ -1,4 +1,5 @@
 # Lights
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-impl \
+    android.hardware.light@2.0-service \
     lights.msm8937
diff --git a/product/qcom-thermal.mk b/product/qcom-thermal.mk
index 2dcc42b..c01f24a 100644
--- a/product/qcom-thermal.mk
+++ b/product/qcom-thermal.mk
@@ -1,3 +1,8 @@
 # Thermal
 PRODUCT_COPY_FILES += \
     $(VENDOR_PATH)/configs/thermal-engine.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine.conf
+
+# Thermal HAL
+PRODUCT_PACKAGES += \
+    android.hardware.thermal@1.0-impl \
+    android.hardware.thermal@1.0-service
diff --git a/product/sensors.mk b/product/sensors.mk
index 3634b16..bfac05d 100644
--- a/product/sensors.mk
+++ b/product/sensors.mk
@@ -12,6 +12,7 @@ PRODUCT_COPY_FILES += \
 # Sensors
 PRODUCT_PACKAGES += \
     android.hardware.sensors@1.0-impl \
+    android.hardware.sensors@1.0-service \
     sensors.msm8937
 
 PRODUCT_COPY_FILES += \
diff --git a/product/vibrator.mk b/product/vibrator.mk
index f0e7f8d..9ee3147 100644
--- a/product/vibrator.mk
+++ b/product/vibrator.mk
@@ -1,3 +1,5 @@
 # Vibrator HAL
 PRODUCT_PACKAGES += \
-    android.hardware.vibrator@1.0-impl
+    android.hardware.vibrator@1.0-impl \
+    android.hardware.vibrator@1.0-service
+