diff --git a/config/thermal/thermal_info_config.json b/config/thermal/thermal_info_config.json
new file mode 100644
index 0000000..4e03283
--- /dev/null
+++ b/config/thermal/thermal_info_config.json
@@ -0,0 +1,122 @@
+{
+    "Sensors": [
+        {
+            "Name": "BIG",
+            "Type": "CPU",
+            "HotThreshold": [
+                "NAN",
+                "NAN",
+                "NAN",
+                96.0,
+                "NAN",
+                "NAN",
+                115.0
+            ],
+            "VrThreshold": "NAN",
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "LITTLE",
+            "Type": "CPU",
+            "HotThreshold": [
+                "NAN",
+                "NAN",
+                "NAN",
+                96.0,
+                "NAN",
+                "NAN",
+                115.0
+            ],
+            "VrThreshold": "NAN",
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "G3D",
+            "Type": "GPU",
+            "HotThreshold": [
+                "NAN",
+                "NAN",
+                "NAN",
+                96.0,
+                "NAN",
+                "NAN",
+                115.0
+            ],
+            "VrThreshold": "NAN",
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "ISP",
+            "Type": "CPU",
+            "HotThreshold": [
+                "NAN",
+                "NAN",
+                "NAN",
+                96.0,
+                "NAN",
+                "NAN",
+                115.0
+            ],
+            "VrThreshold": "NAN",
+            "Multiplier": 0.001
+        },
+        {
+            "Name": "ac",
+            "Type": "USB_PORT",
+            "HotThreshold": [
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "60.0",
+                "NAN"
+            ],
+            "HotHysteresis": [
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                0.0,
+                5.0,
+                0.0
+            ],
+            "VrThreshold": "NAN",
+            "Multiplier": 0.001,
+            "Monitor": true
+        },
+        {
+            "Name": "battery",
+            "Type": "BATTERY",
+            "HotThreshold": [
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                60.0
+            ],
+            "VrThreshold": "NAN",
+            "Multiplier": 0.001
+        }
+    ],
+    "CoolingDevices": [
+        {
+            "Name": "thermal-cpufreq-0",
+            "Type": "CPU"
+        },
+        {
+            "Name": "thermal-cpufreq-1",
+            "Type": "CPU"
+        },
+        {
+            "Name": "thermal-gpufreq-0",
+            "Type": "GPU"
+        },
+        {
+            "Name": "thermal-isp-0",
+            "Type": "COMPONENT"
+        }
+    ]
+}
diff --git a/manifest.xml b/manifest.xml
index b6e201b..194ebd6 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -247,16 +247,6 @@
         <transport>hwbinder</transport>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.thermal</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IThermal</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IThermal/default</fqname>
-    </hal>
-    <hal format="hidl">
         <name>android.hardware.usb</name>
         <transport>hwbinder</transport>
         <version>1.1</version>
diff --git a/platform/config.mk b/platform/config.mk
index 9c457fb..35adf1e 100644
--- a/platform/config.mk
+++ b/platform/config.mk
@@ -20,3 +20,7 @@
 ### POWER
 PRODUCT_COPY_FILES += \
     $(PLATFORM_PATH)/config/power/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
+
+### THERMAL
+PRODUCT_COPY_FILES += \
+    $(PLATFORM_PATH)/config/thermal/thermal_info_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json
diff --git a/platform/product_packages.mk b/platform/product_packages.mk
index 67aa6f7..195b115 100644
--- a/platform/product_packages.mk
+++ b/platform/product_packages.mk
@@ -139,6 +139,10 @@
     android.hardware.soundtrigger@2.2-impl \
     android.hardware.soundtrigger@2.0-service
 
+### THERMAL
+PRODUCT_PACKAGES += \
+    android.hardware.thermal@2.0-service.samsung
+
 ### USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.1-service.exynos9611