diff --git a/rootdir/etc/init.qcom.post_boot.sh b/rootdir/etc/init.qcom.post_boot.sh
index e66106f44244c133f72a9464f68594b0c2409eeb..b143ecb7d1770e426ac2b5ef5b5eede7f6f19956 100644
--- a/rootdir/etc/init.qcom.post_boot.sh
+++ b/rootdir/etc/init.qcom.post_boot.sh
@@ -423,7 +423,11 @@ else
fi
# Set allocstall_threshold to 0 for all targets.
+ # Set swappiness to 100 for all targets
echo 0 > /sys/module/vmpressure/parameters/allocstall_threshold
+ echo 100 > /proc/sys/vm/swappiness
+
+ configure_zram_parameters
configure_read_ahead_kb_values
diff --git a/rootdir/fstab.qcom b/rootdir/fstab.qcom
index cab3095023339df1c1fa06bbfca18215c6eee080..4ea9f8f8f3376469d1d3f0b19d9b2fc158d55973 100644
--- a/rootdir/fstab.qcom
+++ b/rootdir/fstab.qcom
@@ -20,5 +20,3 @@
/devices/platform/soc/7864900.sdhci/mmc_host* auto auto defaults wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=userdata
/devices/platform/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto* auto auto defaults wait,voldmanaged=usb:auto
-
-/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=8
diff --git a/rootdir/fstab_AB.qcom b/rootdir/fstab_AB.qcom
index 18aa85b9d62cd0b68882661276b33aa9b2e79faf..5f45d45aab4560176beb955bda61226a6abb5f81 100644
--- a/rootdir/fstab_AB.qcom
+++ b/rootdir/fstab_AB.qcom
@@ -14,5 +14,3 @@
/devices/platform/soc/7864900.sdhci/mmc_host* auto auto defaults wait,voldmanaged=sdcard1:auto,noemulatedsd,encryptable=userdata
/devices/platform/soc/7000000.ssusb/7000000.dwc3/xhci-hcd.0.auto* auto auto defaults wait,voldmanaged=usb:auto
-
-/dev/block/zram0 none swap defaults zramsize=536870912,max_comp_streams=8
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 38adcc56f23ee0a9545ea5821736b97e23d8c8c5..e0e63051e92dfda5bc4bf0705bcbb03f952b1797 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -668,6 +668,3 @@ service vendor.audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service
oneshot
interface android.hardware.audio@4.0::IDevicesFactory default
interface android.hardware.audio@2.0::IDevicesFactory default
-
-on property:dev.bootcomplete=1
- swapon_all /vendor/etc/fstab.qcom