diff --git a/device.mk b/device.mk
index 753259d..c3173b9 100644
--- a/device.mk
+++ b/device.mk
@@ -161,6 +161,12 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     libprotobuf-cpp-lite
 
+# limit dex2oat threads to improve thermals
+PRODUCT_PROPERTY_OVERRIDES += \
+    dalvik.vm.boot-dex2oat-threads=8 \
+    dalvik.vm.dex2oat-threads=8 \
+    dalvik.vm.image-dex2oat-threads=8
+
 # Ebtables
 PRODUCT_PACKAGES += \
     ebtables \
diff --git a/system.prop b/system.prop
index daa1345..014ca5c 100644
--- a/system.prop
+++ b/system.prop
@@ -2,9 +2,6 @@
 # system.prop for sanders
 #
 
-# Android Run Time
-ro.sys.fw.dex2oat_thread_count=4
-
 # Audio
 audio.deep_buffer.media=true
 vendor.audio.offload.buffer.size.kb=64