diff --git a/files/initramfs-tools/arista-convertfs.j2 b/files/initramfs-tools/arista-convertfs.j2
index 7b315b7725c..2ed51c02203 100644
--- a/files/initramfs-tools/arista-convertfs.j2
+++ b/files/initramfs-tools/arista-convertfs.j2
@@ -130,10 +130,14 @@ for x in "$@"; do
             x1="${x#loop=}"
             image_dir="${x1%/*}"
             ;;
+        SONIC_BOOT_TYPE=warm*|SONIC_BOOT_TYPE=fast*)
+            # Skip this script for warm-reboot and fast-reboot
+            exit 0
+            ;;
     esac
 done
 
-#Check aboot
+# Check aboot
 [ -z "$aboot_flag" ] && exit 0
 
 # Get flash dev name
diff --git a/files/initramfs-tools/arista-hook b/files/initramfs-tools/arista-hook
index 654fe88baa5..521e38435b3 100644
--- a/files/initramfs-tools/arista-hook
+++ b/files/initramfs-tools/arista-hook
@@ -41,6 +41,10 @@ for x in "$@"; do
             x1="${x#loop=}"
             image_dir="${x1%/*}"
             ;;
+        SONIC_BOOT_TYPE=warm*|SONIC_BOOT_TYPE=fast*)
+            # Skip this script for warm-reboot and fast-reboot
+            exit 0
+            ;;
     esac
 done