diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 64c71292..61afeaeb 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -22,24 +22,20 @@ TI_SECURE_DEV_PKG ?= ""
 export TI_SECURE_DEV_PKG
 
 SYSFW_SOC ?= "unknown"
-SYSFW_CONFIG ?= "unknown"
-
-SYSFW_PREFIX = "ti-sci-firmware"
-SYSFW_PREFIX:j721e-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX:j721e-hs-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "ti-fs-firmware"
-SYSFW_PREFIX:j7200-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX:j7200-hs-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX:j721s2-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "ti-fs-firmware"
-SYSFW_PREFIX:am62xx-evm-k3r5 = "ti-fs-firmware"
-
 SYSFW_SUFFIX ?= "unknown"
+SYSFW_CONFIG ?= "unknown"
 
-SYSFW_BASE = "${SYSFW_PREFIX}-${SYSFW_SOC}-${SYSFW_SUFFIX}"
-SYSFW_BASE:append = "${@['','*']['${SYSFW_SUFFIX}' == 'hs']}"
-
-SYSFW_TISCI = "${S}/ti-sysfw/${SYSFW_BASE}.bin"
+SYSFW_PREFIX = "sci"
+SYSFW_PREFIX:j721e-evm-k3r5 = "fs"
+SYSFW_PREFIX:j721e-hs-evm-k3r5 = "fs"
+SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "fs"
+SYSFW_PREFIX:j7200-evm-k3r5 = "fs"
+SYSFW_PREFIX:j7200-hs-evm-k3r5 = "fs"
+SYSFW_PREFIX:j721s2-evm-k3r5 = "fs"
+SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "fs"
+SYSFW_PREFIX:am62xx-evm-k3r5 = "fs"
+
+SYSFW_TISCI = "${S}/ti-sysfw/ti-${SYSFW_PREFIX}-firmware-${SYSFW_SOC}-*.bin"
 
 SYSFW_BINARY = "sysfw-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"
 SYSFW_VBINARY = "sysfw-${PV}-${SYSFW_SOC}-${SYSFW_CONFIG}.itb"