diff --git a/bsp-files/upgrades/import.sh b/bsp-files/upgrades/import.sh
index b6d603a7..e8552efc 100644
--- a/bsp-files/upgrades/import.sh
+++ b/bsp-files/upgrades/import.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2015-2017 Wind River Systems, Inc.
+# Copyright (c) 2015-2022 Wind River Systems, Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -16,10 +16,10 @@ set -x
 echo "$(date): Starting execution: $0 $@"
 
 cleanup() {
-    rm -rf $TMP_RPM
+    rm -rf ${TMP_RPM}
 }
 rollback() {
-    rm -rf $FEED_DIR
+    rm -rf ${FEED_DIR}
 }
 
 error() {
@@ -31,7 +31,6 @@ error() {
 }
 
 trap 'error ${LINENO} $?' ERR
-trap cleanup 0
 
 SCRIPT_DIR=$(dirname $0)
 ISO_DIR=$(dirname $SCRIPT_DIR)
@@ -39,41 +38,74 @@ ISO_DIR=$(dirname $SCRIPT_DIR)
 source $SCRIPT_DIR/version
 source /etc/build.info
 
-FEED_DIR=/www/pages/feed/rel-$VERSION
-CURRENT_FEED_DIR=/www/pages/feed/rel-$SW_VERSION
-TMP_RPM=/tmp/cpio
+FEED_DIR=/var/www/pages/feed/rel-${VERSION}
+CURRENT_FEED_DIR=/var/www/pages/feed/rel-${SW_VERSION}
 
-rm -rf $TMP_RPM
-rm -rf $FEED_DIR
+rm -rf ${FEED_DIR}
+mkdir -p ${FEED_DIR}
 
-mkdir -p $FEED_DIR
+# Centos will be temporarily supported for testing. The import code
+# for Centos 22.12 will be removed soon. No need for any fancy way
+# to detect if it is a Debian iso, just check existance of ostree_repo
+# TODO: remove the "else" clause
+if [ -d ${ISO_DIR}/ostree_repo ]; then
+    # it is a Debian iso.
 
-cp -rp $ISO_DIR/Packages $ISO_DIR/repodata $ISO_DIR/LiveOS $FEED_DIR/
+    # copy pxeboot, kickstart, ostree_repo to feed directory
+    echo "Copy kickstart to ${FEED_DIR}"
+    cp -rp ${ISO_DIR}/kickstart ${FEED_DIR}/
+    echo "Copy pxeboot to ${FEED_DIR}"
+    cp -rp ${ISO_DIR}/pxeboot ${FEED_DIR}/
+    echo "Copy ostree_repo to ${FEED_DIR}"
+    cp -rp ${ISO_DIR}/ostree_repo ${FEED_DIR}/
 
-cp -p $CURRENT_FEED_DIR/install_uuid $FEED_DIR/
+    echo "Copy install_uuid to ${FEED_DIR}"
+    cp ${CURRENT_FEED_DIR}/install_uuid ${FEED_DIR}/
 
-if [ -d $ISO_DIR/patches ]; then
-    mkdir -p /www/pages/updates/rel-${VERSION}
-    cp -r ${ISO_DIR}/patches/Packages ${ISO_DIR}/patches/repodata /www/pages/updates/rel-${VERSION}/
-    rsync -ac ${ISO_DIR}/patches/metadata/ /opt/patching/metadata/
-    mkdir -p /opt/patching/packages/${VERSION}
+    mkdir ${FEED_DIR}/upgrades
+    echo "Copy pxeboot-update-${VERSION}.sh to ${FEED_DIR}/upgrades"
+    cp ${ISO_DIR}/upgrades/pxeboot-update-${VERSION}.sh ${FEED_DIR}/upgrades/
 
-    find /www/pages/updates/rel-${VERSION}/Packages -name '*.rpm' \
-        | xargs --no-run-if-empty -I files cp --preserve=all files /opt/patching/packages/${VERSION}/
-fi
+    echo "Copy efi.img to ${FEED_DIR}"
+    cp ${ISO_DIR}/efi.img ${FEED_DIR}/
+    # for upgrade from 22.06 to Debian 22.12, patch during upgrade is not supported
+else
+    # this is a Centos iso
+    trap cleanup 0
 
-# copy package checksum if it exists
+    TMP_RPM=/tmp/cpio
 
-PKG_FILE="package_checksums"
-PKG_FILE_LOC=/usr/local/share/pkg-list
+    rm -rf ${TMP_RPM}
 
-if [ -f ${ISO_DIR}/${PKG_FILE} ]; then
+    cp -rp ${ISO_DIR}/Packages ${ISO_DIR}/repodata ${ISO_DIR}/LiveOS ${FEED_DIR}/
 
-    DEST_PKG_FILE="${VERSION}_packages_list.txt"
-    if [ ! -d ${PKG_FILE_LOC} ]; then
-        mkdir -p ${PKG_FILE_LOC}
+    cp -p ${CURRENT_FEED_DIR}/install_uuid ${FEED_DIR}/
+
+    if [ -d ${ISO_DIR}/patches ]; then
+        mkdir -p /www/pages/updates/rel-${VERSION}
+        cp -r ${ISO_DIR}/patches/Packages ${ISO_DIR}/patches/repodata /www/pages/updates/rel-${VERSION}/
+        rsync -ac ${ISO_DIR}/patches/metadata/ /opt/patching/metadata/
+        mkdir -p /opt/patching/packages/${VERSION}
+
+        find /www/pages/updates/rel-${VERSION}/Packages -name '*.rpm' \
+            | xargs --no-run-if-empty -I files cp --preserve=all files /opt/patching/packages/${VERSION}/
     fi
 
-    cp ${ISO_DIR}/${PKG_FILE} ${PKG_FILE_LOC}/${DEST_PKG_FILE}
-    cp ${ISO_DIR}/${PKG_FILE} ${FEED_DIR}/${PKG_FILE}
+    # copy package checksum if it exists
+
+    PKG_FILE="package_checksums"
+    PKG_FILE_LOC=/usr/local/share/pkg-list
+
+    if [ -f ${ISO_DIR}/${PKG_FILE} ]; then
+
+        DEST_PKG_FILE="${VERSION}_packages_list.txt"
+        if [ ! -d ${PKG_FILE_LOC} ]; then
+            mkdir -p ${PKG_FILE_LOC}
+        fi
+
+        cp ${ISO_DIR}/${PKG_FILE} ${PKG_FILE_LOC}/${DEST_PKG_FILE}
+        cp ${ISO_DIR}/${PKG_FILE} ${FEED_DIR}/${PKG_FILE}
+    fi
 fi
+
+echo 'import has completed'