diff --git a/configs/thermal-engine-8996.conf b/configs/thermal-engine-8996.conf
new file mode 100644
index 0000000..c496ad2
--- /dev/null
+++ b/configs/thermal-engine-8996.conf
@@ -0,0 +1,120 @@
+[SKIN-SS-GOLD]
+algo_type ss
+sampling 250
+sensor xo_therm_buf
+device cpu_voltage
+set_point 40000
+set_point_clr 38000
+time_constant 0
+device_perf_floor	2150400
+
+[SKIN-SS-GOLD-AND-SILVER]
+algo_type ss
+sampling 250
+sensor xo_therm_buf
+device cpu_voltage
+set_point 42000
+set_point_clr 40000
+time_constant 0
+device_perf_floor	1593600
+
+[SKIN-SS-CPUS-ALL]
+algo_type ss
+sampling 250
+sensor xo_therm_buf
+device cpu_voltage
+set_point 44000
+set_point_clr 42000
+time_constant 0
+device_perf_floor   1132800
+
+[SKIN-SS-CPUS-ALL-1]
+algo_type ss
+sampling 250
+sensor xo_therm_buf
+device cpu_voltage
+set_point 48000
+set_point_clr 45000
+time_constant 0
+
+[SS-GPU]
+#algo_type        ss
+sampling          250
+sensor            xo_therm_buf
+device            gpu
+set_point         47000
+set_point_clr     43000
+time_constant     0
+
+[GPU_management]
+algo_type			monitor
+sensor				xo_therm_buf
+sampling			1000
+thresholds			41000		43000
+thresholds_clr			38000		41000
+actions				gpu		gpu
+action_info			510000000	401800000
+
+
+[SKIN-BATTERY-MONITOR]
+algo_type 			monitor
+sampling 			1000
+sensor 				xo_therm_buf
+thresholds 			43000		45000		48000		60000
+thresholds_clr 			41000		43000		45000		48000
+actions 		 	battery 	battery 	battery		battery
+action_info			0		1		2		3
+
+[CAMERA-CAMCORDER-MONITOR]
+algo_type           monitor
+sampling            1000
+sensor              xo_therm_buf
+thresholds          42000               45000               50000
+thresholds_clr      40000               42000               45000
+actions             camera+camcorder    camera+camcorder    camera+camcorder
+action_info         1                   2                   3
+
+[HISTORY-XO]
+algo_type 			history
+sampling 			1000
+sensor 				xo_therm_buf
+thresholds 			31000		41000		46000		51000		56000		61000
+thresholds_clr 			30000		40000		45000		50000		55000		60000
+actions 		 	history_log 	history_log 	history_log	history_log	history_log	history_log
+action_info			0		1		2		3		4		5
+
+[HISTORY-CPU0]
+algo_type 			history
+sampling 			1000
+sensor 				tsens_tz_sensor3
+thresholds 			61000		76000		91000
+thresholds_clr 			60000		75000		90000
+actions 		 	history_log 	history_log	history_log
+action_info			0		1		2
+
+[HISTORY-CPU4]
+algo_type 			history
+sampling 			1000
+sensor 				tsens_tz_sensor8
+thresholds 			61000		76000		91000
+thresholds_clr 			60000		75000		90000
+actions 		 	history_log 	history_log 	history_log
+action_info			0		1		2
+
+[HISTORY-MODEM-PA0]
+algo_type 			history
+sampling 			1000
+sensor 				pa_therm0
+thresholds 			31000		36000		41000		46000		51000		56000		61000
+thresholds_clr 			30000		35000		40000		45000		50000		55000		60000
+actions 		 	history_log 	history_log 	history_log	history_log	history_log	history_log	history_log
+action_info			0		1		2		3		4		5		6
+
+[HISTORY-MODEM-PA1]
+algo_type 			history
+sampling 			1000
+sensor 				pa_therm1
+thresholds 			31000		36000		41000		46000		51000		56000		61000
+thresholds_clr 			30000		35000		40000		45000		50000		55000		60000
+actions 		 	history_log 	history_log 	history_log	history_log	history_log	history_log	history_log
+action_info			0		1		2		3		4		5		6
diff --git a/device.mk b/device.mk
index 62d8c83..5e43d6b 100644
--- a/device.mk
+++ b/device.mk
@@ -61,5 +61,9 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/nfc/libnfc-brcm.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-brcm.conf \
     $(LOCAL_PATH)/nfc/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf
 
+# Thermal
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/thermal-engine-8996.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-engine-8996.conf
+
 # Inherit from msm8996-common
 $(call inherit-product, device/xiaomi/msm8996-common/msm8996.mk)
diff --git a/proprietary-files.txt b/proprietary-files.txt
index ef0e176..3d771e6 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -182,6 +182,3 @@ vendor/firmware/libpn548ad_fw.so
 # Sensors
 etc/sensors/hals.conf:vendor/etc/sensors/hals.conf
 etc/sensors/sensor_def_qcomdev.conf
-
-# Thermal
-etc/thermal-engine-8996.conf