diff --git a/common.mk b/common.mk
index e43d987..4a590a1 100644
--- a/common.mk
+++ b/common.mk
@@ -435,7 +435,7 @@ PRODUCT_COPY_FILES += \
 
 # Thermal
 PRODUCT_PACKAGES += \
-    android.hardware.thermal@2.0-service.mock \
+    android.hardware.thermal@2.0-service.qti \
     android.hardware.thermal@2.0 \
     android.hardware.thermal@2.0.vendor
 
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 8a3e731..dd9dffd 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -94,7 +94,6 @@
 
 # Thermal
 /dev/mmi_sys_temp                                       u:object_r:vendor_thermal_device:s0
-/(vendor|system/vendor)/bin/hw/android\.hardware\.thermal@2\.0-service\.mock                                                u:object_r:hal_thermal_default_exec:s0
 
 # Vendor init scripts
 /(vendor|system/vendor)/bin/load_touch\.sh                      u:object_r:vendor_qti_init_shell_exec:s0
diff --git a/sepolicy/vendor/hal_thermal_default.te b/sepolicy/vendor/hal_thermal_default.te
deleted file mode 100644
index 2ccabe4..0000000
--- a/sepolicy/vendor/hal_thermal_default.te
+++ /dev/null
@@ -1,8 +0,0 @@
-allow hal_thermal_default sysfs_thermal:dir r_dir_perms;
-allow hal_thermal_default sysfs_thermal:file rw_file_perms;
-allow hal_thermal_default proc_stat:file r_file_perms;
-
-allow hal_thermal_default self:netlink_kobject_uevent_socket create_socket_perms_no_ioctl;
-
-# read thermal config
-get_prop(hal_thermal_default, vendor_thermal_prop)
diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te
index bb50574..167417c 100644
--- a/sepolicy/vendor/property.te
+++ b/sepolicy/vendor/property.te
@@ -5,6 +5,3 @@ vendor_internal_prop(vendor_mot_fingerprint_prop);
 vendor_internal_prop(vendor_mot_hw_prop);
 vendor_internal_prop(vendor_mot_touch_prop);
 vendor_internal_prop(vendor_mot_nfc_prop);
-
-# Thermal engine
-vendor_internal_prop(vendor_thermal_prop)
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 252414c..f1e63b1 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -21,6 +21,3 @@ vendor.nfc.fw_status       u:object_r:vendor_mot_nfc_prop:s0
 persist.vendor.hardware.fingerprint            u:object_r:vendor_mot_fingerprint_prop:s0
 vendor.hw.fps.ident                            u:object_r:vendor_mot_fingerprint_prop:s0
 vendor.hw.fingerprint.status                   u:object_r:vendor_mot_fingerprint_prop:s0
-
-# Thermal engine
-vendor.thermal.config                   u:object_r:vendor_thermal_prop:s0
diff --git a/sepolicy/vendor/thermal-engine.te b/sepolicy/vendor/thermal-engine.te
deleted file mode 100644
index 7791706..0000000
--- a/sepolicy/vendor/thermal-engine.te
+++ /dev/null
@@ -1,7 +0,0 @@
-allow vendor_thermal-engine { proc_stat proc_loadavg }:file r_file_perms;
-allow vendor_thermal-engine vendor_thermal_device:chr_file rw_file_perms;
-rw_dir_file(vendor_thermal-engine, vendor_sysfs_battery_supply)
-rw_dir_file(vendor_thermal-engine, vendor_sysfs_usb_supply)
-
-set_prop(vendor_thermal-engine, vendor_thermal_prop);
-r_dir_file(vendor_thermal-engine, sysfs_thermal)
diff --git a/sepolicy/vendor/vendor_thermal-engine.te b/sepolicy/vendor/vendor_thermal-engine.te
new file mode 100644
index 0000000..b76e121
--- /dev/null
+++ b/sepolicy/vendor/vendor_thermal-engine.te
@@ -0,0 +1,4 @@
+allow vendor_thermal-engine { proc_stat proc_loadavg }:file r_file_perms;
+allow vendor_thermal-engine vendor_thermal_device:chr_file rw_file_perms;
+r_dir_file(vendor_thermal-engine, vendor_sysfs_battery_supply)
+r_dir_file(vendor_thermal-engine, vendor_sysfs_usb_supply)