diff --git a/device.mk b/device.mk
index e16e53b..bad6551 100644
--- a/device.mk
+++ b/device.mk
@@ -270,7 +270,8 @@ PRODUCT_PACKAGES += \
 
 # IR
 PRODUCT_PACKAGES += \
-    android.hardware.ir-service.lineage
+    android.hardware.ir@1.0-impl \
+    android.hardware.ir@1.0-service
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml
diff --git a/hidl/manifest_xiaomi.xml b/hidl/manifest_xiaomi.xml
index c03d35e..72aaec4 100644
--- a/hidl/manifest_xiaomi.xml
+++ b/hidl/manifest_xiaomi.xml
@@ -1,4 +1,13 @@
 <manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>android.hardware.ir</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IConsumerIr</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>vendor.xiaomi.hardware.campostproc</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7a4b01e..f41665b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -753,6 +753,9 @@ vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service
 vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc
 vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so
 
+# Consumer IR
+vendor/lib64/hw/consumerir.lahaina.so
+
 # Diag
 vendor/bin/diag-router
 vendor/etc/init/vendor.qti.diag.rc
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index e42a054..1dfd66a 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -41,6 +41,9 @@
 /(odm|vendor/odm)/bin/hw/vendor\.dolby_sp\.hardware\.dmssp@2\.0-service                             u:object_r:hal_dms_default_exec:s0
 /(vendor|odm)/bin/hw/vendor\.dolby_sp\.media\.c2@1\.0-service                                       u:object_r:mediacodec_exec:s0
 
+# IR
+/dev/ir_spi                                      u:object_r:ir_spi_device:s0
+
 # Hexagon DSP-side executable needed for Halide operation
 # This is labeled as public_adsprpcd_file as it needs to be read by apps
 # (e.g. Google Camera App)
diff --git a/sepolicy/vendor/hal_ir_default.te b/sepolicy/vendor/hal_ir_default.te
new file mode 100644
index 0000000..ce503ef
--- /dev/null
+++ b/sepolicy/vendor/hal_ir_default.te
@@ -0,0 +1,3 @@
+type ir_spi_device, dev_type;
+
+allow hal_ir_default ir_spi_device:chr_file rw_file_perms;