diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml
index 03839263..e060c31e 100644
--- a/.github/workflows/matrix_build.yml
+++ b/.github/workflows/matrix_build.yml
@@ -484,7 +484,7 @@ jobs:
                 ;;
             esac
 
-            NORFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-${{ matrix.release }}-nor.tgz"
+            NORFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-nor-${{ matrix.release }}.tgz"
             echo "NORFW_PATH=$NORFW_PATH" >> $GITHUB_ENV
             NORFW_FILE=$(basename $NORFW_PATH)
             echo "NORFW_FILE=$NORFW_FILE" >> $GITHUB_ENV
@@ -497,7 +497,7 @@ jobs:
           fi
 
           if [ -f rootfs.ubifs ] ; then
-            NANDFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-${{ matrix.release }}-nand.tgz"
+            NANDFW_PATH="${IMAGES_DIR}/openipc.${{ matrix.platform }}-nand-${{ matrix.release }}.tgz"
             echo "NANDFW_PATH=$NANDFW_PATH" >> $GITHUB_ENV
             NANDFW_FILE=$(basename $NANDFW_PATH)
             echo "NANDFW_FILE=$NANDFW_FILE" >> $GITHUB_ENV
diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade
index 1571b898..ebedb3d8 100755
--- a/general/overlay/usr/sbin/sysupgrade
+++ b/general/overlay/usr/sbin/sysupgrade
@@ -3,7 +3,7 @@
 # OpenIPC.org | v.20220831
 #
 
-scr_version=1.0.11
+scr_version=1.0.12
 
 args=" $@"
 
@@ -78,7 +78,7 @@ download_firmware() {
 	echo_c 33 "\nFirmware"
 	osr=$(get_system_build)
 	ftype=$(get_flash_type)
-	build="${soc}-${osr}-${ftype}"
+	build="${soc}-${ftype}-${osr}"
 	[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/latest/openipc.${build}.tgz"
 	echo "Download from $url"
 	[ -z "$HASERLVER" ] && progress="-#" || progress="-s"