diff --git a/scripts/fast-reboot b/scripts/fast-reboot
index 922d217e3f..bb42eaad81 100755
--- a/scripts/fast-reboot
+++ b/scripts/fast-reboot
@@ -253,6 +253,7 @@ function backup_database()
                                           and not string.match(k, 'WARM_RESTART_ENABLE_TABLE|') \
                                           and not string.match(k, 'VXLAN_TUNNEL_TABLE|') \
                                           and not string.match(k, 'BUFFER_MAX_PARAM_TABLE|') \
+                                          and not string.match(k, 'STORAGE_INFO|') \
                                           and not string.match(k, 'FAST_RESTART_ENABLE_TABLE|') then
                 redis.call('del', k)
             end
@@ -808,7 +809,6 @@ if [[ -x ${DEVPATH}/${PLATFORM}/${PLATFORM_FWUTIL_AU_REBOOT_HANDLE} ]]; then
     fi
 fi
 
-
 # Enable Watchdog Timer
 if [ -x ${WATCHDOG_UTIL} ]; then
     debug "Enabling Watchdog before ${REBOOT_TYPE}"
diff --git a/scripts/reboot b/scripts/reboot
index 2d1cd8a87c..bf0590bbaf 100755
--- a/scripts/reboot
+++ b/scripts/reboot
@@ -57,8 +57,8 @@ function stop_pmon_service()
 {
      CONTAINER_STOP_RC=0
      debug "Stopping pmon docker"
-     docker kill pmon &> /dev/null || CONTAINER_STOP_RC=$?
      systemctl stop pmon || debug "Ignore stopping pmon error $?"
+     docker kill pmon &> /dev/null || CONTAINER_STOP_RC=$?
      if [[ CONTAINER_STOP_RC -ne 0 ]]; then
         debug "Failed killing container pmon RC $CONTAINER_STOP_RC ."
      fi
diff --git a/scripts/soft-reboot b/scripts/soft-reboot
index 957c6009eb..0b9030a6f7 100755
--- a/scripts/soft-reboot
+++ b/scripts/soft-reboot
@@ -64,8 +64,8 @@ function stop_pmon_service()
 {
      CONTAINER_STOP_RC=0
      debug "Stopping pmon docker"
-     docker kill pmon &> /dev/null || CONTAINER_STOP_RC=$?
      systemctl stop pmon || debug "Ignore stopping pmon error $?"
+     docker kill pmon &> /dev/null || CONTAINER_STOP_RC=$?
      if [[ CONTAINER_STOP_RC -ne 0 ]]; then
         debug "Failed killing container pmon RC $CONTAINER_STOP_RC ."
      fi