diff --git a/rootdir/bin/init.kernel.post_boot-lahaina.sh b/rootdir/bin/init.kernel.post_boot-lahaina.sh
index f2f7f56bc683677ddf8c4041eda0b02331ad4f7f..c79fc044471e506b74f2ae0fcb7f0eae1ec1e523 100755
--- a/rootdir/bin/init.kernel.post_boot-lahaina.sh
+++ b/rootdir/bin/init.kernel.post_boot-lahaina.sh
@@ -61,7 +61,7 @@ function configure_zram_parameters() {
 		if [ -f /sys/block/zram0/use_dedup ]; then
 			echo 1 > /sys/block/zram0/use_dedup
 		fi
-		# echo "$zRamSizeMB""$diskSizeUnit" > /sys/block/zram0/disksize
+		echo "$zRamSizeMB""$diskSizeUnit" > /sys/block/zram0/disksize
 
 		# ZRAM may use more memory than it saves if SLAB_STORE_USER
 		# debug option is enabled.
@@ -123,10 +123,24 @@ function configure_memory_parameters() {
 
 	configure_zram_parameters
 	configure_read_ahead_kb_values
-	echo 0 > /proc/sys/vm/page-cluster
 	echo 100 > /proc/sys/vm/swappiness
 	echo 1 > /proc/sys/vm/watermark_scale_factor
-	echo 0 > /proc/sys/vm/watermark_boost_factor
+
+	# add memory limit to camera cgroup
+	MemTotalStr=`cat /proc/meminfo | grep MemTotal`
+	MemTotal=${MemTotalStr:16:8}
+
+	if [ $MemTotal -gt 8388608 ]; then
+		let LimitSize=838860800
+	else
+		let LimitSize=524288000
+	fi
+
+	echo $LimitSize > /dev/memcg/camera/provider/memory.soft_limit_in_bytes
+
+	if [ $MemTotal -le 8388608 ]; then
+		echo 0 > /proc/sys/vm/watermark_boost_factor
+	fi
 }
 
 rev=`cat /sys/devices/soc0/revision`
diff --git a/rootdir/bin/init.kernel.post_boot-shima.sh b/rootdir/bin/init.kernel.post_boot-shima.sh
index a7fe0b9b1fb703b6146704254930f6cf35c0aae7..d16146a495b6001d1f63c3ffafa350993f4ee44d 100755
--- a/rootdir/bin/init.kernel.post_boot-shima.sh
+++ b/rootdir/bin/init.kernel.post_boot-shima.sh
@@ -61,7 +61,7 @@ function configure_zram_parameters() {
 		if [ -f /sys/block/zram0/use_dedup ]; then
 			echo 1 > /sys/block/zram0/use_dedup
 		fi
-		#echo "$zRamSizeMB""$diskSizeUnit" > /sys/block/zram0/disksize
+		echo "$zRamSizeMB""$diskSizeUnit" > /sys/block/zram0/disksize
 
 		# ZRAM may use more memory than it saves if SLAB_STORE_USER
 		# debug option is enabled.
@@ -125,13 +125,17 @@ function configure_memory_parameters() {
 
 	configure_zram_parameters
 	configure_read_ahead_kb_values
-	echo 0 > /proc/sys/vm/page-cluster
 	echo 100 > /proc/sys/vm/swappiness
 
         # Disable wsf  beacause we are using efk.
         # wsf Range : 1..1000. So set to bare minimum value 1.
         echo 1 > /proc/sys/vm/watermark_scale_factor
-        echo 0 > /proc/sys/vm/watermark_boost_factor
+
+	MemTotalStr=`cat /proc/meminfo | grep MemTotal`
+	MemTotal=${MemTotalStr:16:8}
+	if [ $MemTotal -le 8388608 ]; then
+		echo 0 > /proc/sys/vm/watermark_boost_factor
+	fi
 
 	#Spawn 2 kswapd threads which can help in fast reclaiming of pages
 	echo 2 > /proc/sys/vm/kswapd_threads
@@ -192,7 +196,11 @@ echo 691200 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
 echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/pl
 
 # configure input boost settings
-echo "0:1171200" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+if [ $rev == "1.0" ]; then
+	echo "0:1382800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+else
+	echo "0:1305600" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+fi
 echo 120 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
 
 # configure governor settings for gold cluster
diff --git a/rootdir/bin/init.kernel.post_boot-yupik.sh b/rootdir/bin/init.kernel.post_boot-yupik.sh
index 1b6f84b7ce4c5a818f9835e07f8bdfbab02fc834..ad6b0d2aecc08827255d0c9af84e2bbb8f255eba 100755
--- a/rootdir/bin/init.kernel.post_boot-yupik.sh
+++ b/rootdir/bin/init.kernel.post_boot-yupik.sh
@@ -131,6 +131,12 @@ function configure_memory_parameters() {
         # wsf Range : 1..1000. So set to bare minimum value 1.
         echo 1 > /proc/sys/vm/watermark_scale_factor
 
+	MemTotalStr=`cat /proc/meminfo | grep MemTotal`
+	MemTotal=${MemTotalStr:16:8}
+	if [ $MemTotal -le 8388608 ]; then
+		echo 0 > /proc/sys/vm/watermark_boost_factor
+	fi
+
 	#Spawn 2 kswapd threads which can help in fast reclaiming of pages
 	echo 2 > /proc/sys/vm/kswapd_threads
 }
@@ -192,7 +198,7 @@ echo 691200 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
 echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/pl
 
 # configure input boost settings
-echo "0:1152000" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+echo "0:1324800" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
 echo 120 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
 
 # configure governor settings for gold cluster