diff --git a/build_image.sh b/build_image.sh
index 5353e85ab2..d67826e083 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -28,12 +28,12 @@ IMAGE_VERSION="${SONIC_IMAGE_VERSION}"
 generate_onie_installer_image()
 {
     # Copy platform-specific ONIE installer config files where onie-mk-demo.sh expects them
-    rm -rf ./installer/x86_64/platforms/
-    mkdir -p ./installer/x86_64/platforms/
+    rm -rf ./installer/${TARGET_PLATFORM}/platforms/
+    mkdir -p ./installer/${TARGET_PLATFORM}/platforms/
     for VENDOR in `ls ./device`; do
-        for PLATFORM in `ls ./device/$VENDOR`; do
+        for PLATFORM in `ls ./device/$VENDOR | grep ^${TARGET_PLATFORM}`; do
             if [ -f ./device/$VENDOR/$PLATFORM/installer.conf ]; then
-                cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/x86_64/platforms/$PLATFORM
+                cp ./device/$VENDOR/$PLATFORM/installer.conf ./installer/${TARGET_PLATFORM}/platforms/$PLATFORM
             fi
 
         done
diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf
index 9f237eda7f..5cf417fa44 100644
--- a/platform/marvell-armhf/platform.conf
+++ b/platform/marvell-armhf/platform.conf
@@ -9,7 +9,6 @@ kernel_addr=0x1100000
 fdt_addr=0x1000000
 fdt_high=0x10fffff
 initrd_addr=0x2000000
-VAR_LOG=512
 
 kernel_fname="/boot/vmlinuz-4.19.0-12-2-armmp"
 initrd_fname="/boot/initrd.img-4.19.0-12-2-armmp"
@@ -76,7 +75,7 @@ prepare_boot_menu() {
             UBOOT_ENV_ERASE_SIZ="0x$(grep uboot-env /proc/mtd | awk '{print $3}')"
             if [[ -n "$UBOOT_ENV_SIZ" && -n "$UBOOT_ENV_ERASE_SIZ" ]]
             then
-                # Env info from DTB 
+                # Env info from DTB
                 FW_ENV_DTB="/dev/$DTB_HAS_ENV_BLK 0x00000000 $UBOOT_ENV_SIZ $UBOOT_ENV_ERASE_SIZ"
             fi
         fi
@@ -147,8 +146,8 @@ prepare_boot_menu() {
     BORDER='echo "---------------------------------------------------";echo;'
     fw_setenv ${FW_ARG} print_menu $BORDER $BOOT1 $BOOT2 $BOOT3 $BORDER > /dev/null
 
-    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG loglevel=4" > /dev/null
-    fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG loglevel=4" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs "net.ifnames=0 loopfstype=squashfs loop=$image_dir/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null
+    fw_setenv ${FW_ARG} linuxargs_old "net.ifnames=0 loopfstype=squashfs loop=$image_dir_old/$FILESYSTEM_SQUASHFS systemd.unified_cgroup_hierarchy=0 varlog_size=$VAR_LOG_SIZE loglevel=4" > /dev/null
 
     # Set boot configs
     fw_setenv ${FW_ARG} kernel_addr $kernel_addr > /dev/null
@@ -178,7 +177,7 @@ prepare_boot_menu() {
 }
 
 create_ubi_partition() {
-    ubidetach /dev/ubi_ctrl -d 0 2>/dev/null || true 
+    ubidetach /dev/ubi_ctrl -d 0 2>/dev/null || true
 
     trap_push "${onie_bin} ubidetach -d 0 /dev/ubi_ctrl || true"
     echo -en "Format mtd partition '$mtd_dev' "
@@ -234,7 +233,7 @@ create_gpt_partition() {
 }
 
 create_partition() {
-    # Platform speicific partition 
+    # Platform speicific partition
     if [ "$PLATFORM" = "armhf-marvell_et6448m_52x-r0" ]; then
         echo "Doing UBI partition"
         create_ubi_partition