diff --git a/device-common.mk b/device-common.mk
index 0076e31..eb6ea40 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -242,8 +242,7 @@ PRODUCT_PACKAGES += \
 
 # Thermal
 PRODUCT_PACKAGES += \
-    android.hardware.thermal@1.0-impl \
-    android.hardware.thermal@1.0-service
+    android.hardware.thermal@2.0-service.samsung
     
 # Touchscreen
 PRODUCT_COPY_FILES += \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 566b5e1..2dc1ea1 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -214,6 +214,7 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.samsung               u:object_r:hal_light_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service\.samsung u:object_r:hal_fingerprint_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.power@1\.0-service\.exynos                u:object_r:hal_power_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.thermal@2\.0-service\.samsung                u:object_r:hal_thermal_default_exec:s0
 
 # Samsung proprietaries
 /(vendor|system/vendor)/bin/hw/sec\.android\.hardware\.nfc@1\.2-service		                u:object_r:hal_nfc_default_exec:s0