diff --git a/rootdir/etc/init.qcom.post_boot.sh b/rootdir/etc/init.qcom.post_boot.sh
index a4ab7a3eddddd05a7f6034134af4b1dfab62b203..c788a54fb1ec3a02c91775985fb53ede708a3313 100644
--- a/rootdir/etc/init.qcom.post_boot.sh
+++ b/rootdir/etc/init.qcom.post_boot.sh
@@ -423,11 +423,7 @@ 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 edc0592067b79575865d2bb045310594b2eb4110..45f16b7fa2a0d3c27b755094a593e086ceb5df95 100644
--- a/rootdir/fstab.qcom
+++ b/rootdir/fstab.qcom
@@ -20,3 +20,5 @@
 
 /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 c7089972aa9b60156363c1ba6aefd7357ecf397c..c169ce0f16e17dd303a5748e175d8ca6dfd35d75 100644
--- a/rootdir/fstab_AB.qcom
+++ b/rootdir/fstab_AB.qcom
@@ -14,3 +14,5 @@
 
 /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 b42b3e53c290f37fa44288dc22b22605e744db90..c67986490dcca177b4a70f9603553ec97ea3ad73 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -668,3 +668,6 @@ 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