diff --git a/bengal.mk b/bengal.mk
index fcdb336..7728e69 100644
--- a/bengal.mk
+++ b/bengal.mk
@@ -137,9 +137,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     disable_configstore
 
-# Dalvik
-$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
-
 # Display
 PRODUCT_PACKAGES += \
     android.hardware.graphics.mapper@3.0-impl-qti-display \
@@ -385,6 +382,7 @@ PRODUCT_PACKAGES += \
     init.qti.early_init.sh \
     init.mmi.charge_only.rc \
     init.mmi.chipset.rc \
+    init.mmi.dalvik.rc \
     init.mmi.debug.rc \
     init.mmi.rc \
     init.qcom.factory.rc \
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index dc1dc85..41a932d 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -104,6 +104,14 @@ LOCAL_SRC_FILES    := etc/init.mmi.chipset.rc
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.mmi.dalvik.rc
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/init.mmi.dalvik.rc
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)/init/hw
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.mmi.debug.rc
 LOCAL_MODULE_TAGS  := optional
diff --git a/rootdir/etc/init.mmi.dalvik.rc b/rootdir/etc/init.mmi.dalvik.rc
new file mode 100644
index 0000000..fbbbbdc
--- /dev/null
+++ b/rootdir/etc/init.mmi.dalvik.rc
@@ -0,0 +1,23 @@
+on property:ro.vendor.hw.ram=4GB
+    setprop dalvik.vm.heapstartsize 8m
+    setprop dalvik.vm.heapgrowthlimit 192m
+    setprop dalvik.vm.heapsize 512m
+    setprop dalvik.vm.heaptargetutilization 0.75
+    setprop dalvik.vm.heapminfree 512k
+    setprop dalvik.vm.heapmaxfree 8m
+
+on property:ro.vendor.hw.ram=6GB
+    setprop dalvik.vm.heapstartsize 12m
+    setprop dalvik.vm.heapgrowthlimit 256m
+    setprop dalvik.vm.heapsize 512m
+    setprop dalvik.vm.heaptargetutilization 0.5
+    setprop dalvik.vm.heapminfree 6m
+    setprop dalvik.vm.heapmaxfree 24m
+
+on property:ro.vendor.hw.ram=8GB
+    setprop dalvik.vm.heapstartsize 12m
+    setprop dalvik.vm.heapgrowthlimit 256m
+    setprop dalvik.vm.heapsize 512m
+    setprop dalvik.vm.heaptargetutilization 0.5
+    setprop dalvik.vm.heapminfree 6m
+    setprop dalvik.vm.heapmaxfree 24m
diff --git a/rootdir/etc/init.mmi.rc b/rootdir/etc/init.mmi.rc
index beebeef..a1233b6 100644
--- a/rootdir/etc/init.mmi.rc
+++ b/rootdir/etc/init.mmi.rc
@@ -26,6 +26,9 @@ import /vendor/etc/init/hw/init.mmi.debug.rc
 import /vendor/etc/init/carrier/init.${ro.boot.carrier}.rc
 import /vendor/etc/init/carrier/init.default.rc
 
+# Dalvik configuration
+import /vendor/etc/init/hw/init.mmi.dalvik.rc
+
 on early-boot
     write /sys/module/subsystem_restart/parameters/disable_restart_work 0x0
 
diff --git a/vendor.prop b/vendor.prop
index ccafd9d..389b68f 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -103,6 +103,12 @@ persist.vendor.cne.logging.qxdm=3974
 
 # Dalvik
 dalvik.vm.dex2oat64.enabled=true
+dalvik.vm.heapstartsize=8m
+dalvik.vm.heapgrowthlimit=256m
+dalvik.vm.heapsize=512m
+dalvik.vm.heaptargetutilization=0.75
+dalvik.vm.heapminfree=1m
+dalvik.vm.heapmaxfree=8m
 
 # Display
 debug.sf.enable_hwc_vds=1