diff --git a/config/boards/beaglebone-ai64.conf b/config/boards/beaglebone-ai64.conf
index 21dfb07c62..d83d71476e 100644
--- a/config/boards/beaglebone-ai64.conf
+++ b/config/boards/beaglebone-ai64.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="BeagleBone AI-64"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="Grippy98"
+BOOT_SOC="j721e"
 BOOTCONFIG="j721e_beagleboneai64_a72_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-j721e-beagleboneai64.dts"
diff --git a/config/boards/beagleplay.conf b/config/boards/beagleplay.conf
index 982f6275b0..6a82c71fbc 100644
--- a/config/boards/beagleplay.conf
+++ b/config/boards/beagleplay.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="BeaglePlay"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="Grippy98"
+BOOT_SOC="am62"
 BOOTCONFIG="am62x_beagleplay_a53_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-am625-beagleplay.dts"
diff --git a/config/boards/beagley-ai.conf b/config/boards/beagley-ai.conf
index 46efa15d9c..45db99a9c4 100644
--- a/config/boards/beagley-ai.conf
+++ b/config/boards/beagley-ai.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="BeagleY-AI"
 BOARDFAMILY="k3-beagle"
 BOARD_MAINTAINER="Grippy98"
+BOOT_SOC="j722s"
 BOOTCONFIG="am67a_beagley_ai_a53_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="k3-am67a-beagley-ai.dts"
diff --git a/config/boards/pocketbeagle2.conf b/config/boards/pocketbeagle2.conf
index 44552a0a2f..7bf3a0ab19 100644
--- a/config/boards/pocketbeagle2.conf
+++ b/config/boards/pocketbeagle2.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="PocketBeagle 2"
 BOARDFAMILY="k3-beagle"
 BOARD_MAINTAINER="Grippy98"
+BOOT_SOC="am62"
 BOOTCONFIG="am6232_pocketbeagle2_a53_defconfig"
 BOOTFS_TYPE="fat"
 TIBOOT3_BOOTCONFIG="am6232_pocketbeagle2_r5_defconfig"
diff --git a/config/boards/sk-am62b.conf b/config/boards/sk-am62b.conf
index 8b50628f32..96a030386c 100644
--- a/config/boards/sk-am62b.conf
+++ b/config/boards/sk-am62b.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="SK-AM62B"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="jonaswood01"
+BOOT_SOC="am62"
 BOOTCONFIG="am62x_evm_a53_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-am625-sk.dts"
diff --git a/config/boards/sk-am62p.conf b/config/boards/sk-am62p.conf
index 004a670bbe..b2cf7d7018 100644
--- a/config/boards/sk-am62p.conf
+++ b/config/boards/sk-am62p.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="SK-AM62P"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="jonaswood01"
+BOOT_SOC="am62p"
 BOOTCONFIG="am62px_evm_a53_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-am62p5-sk.dts"
diff --git a/config/boards/sk-am64b.conf b/config/boards/sk-am64b.conf
index 504ec55569..67ca011e47 100644
--- a/config/boards/sk-am64b.conf
+++ b/config/boards/sk-am64b.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="SK-AM64B"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="jonaswood01"
+BOOT_SOC="am64"
 BOOTCONFIG="am64x_evm_a53_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-am642-sk.dts"
diff --git a/config/boards/sk-am68.conf b/config/boards/sk-am68.conf
index e3ba844a6c..3f8adac0f9 100644
--- a/config/boards/sk-am68.conf
+++ b/config/boards/sk-am68.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="SK-AM68"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="glneo"
+BOOT_SOC="j721s2"
 BOOTCONFIG="j721s2_evm_a72_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-am68-sk-base-board.dts"
diff --git a/config/boards/sk-am69.conf b/config/boards/sk-am69.conf
index 5caba5f452..e34de73c64 100644
--- a/config/boards/sk-am69.conf
+++ b/config/boards/sk-am69.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="SK-AM69"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="glneo"
+BOOT_SOC="j784s4"
 BOOTCONFIG="am69_sk_a72_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-am69-sk.dts"
diff --git a/config/boards/sk-tda4vm.conf b/config/boards/sk-tda4vm.conf
index 45d871c8ef..39dbf00805 100644
--- a/config/boards/sk-tda4vm.conf
+++ b/config/boards/sk-tda4vm.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="SK-TDA4VM"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="glneo"
+BOOT_SOC="j721e"
 BOOTCONFIG="j721e_evm_a72_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-j721e-sk.dts"
diff --git a/config/boards/tmds62levm.conf b/config/boards/tmds62levm.conf
index b271e233e4..517c855aef 100644
--- a/config/boards/tmds62levm.conf
+++ b/config/boards/tmds62levm.conf
@@ -3,6 +3,7 @@
 BOARD_NAME="TMDS62LEVM"
 BOARDFAMILY="k3"
 BOARD_MAINTAINER="jonaswood01"
+BOOT_SOC="am62l"
 BOOTCONFIG="am62lx_evm_defconfig"
 BOOTFS_TYPE="fat"
 BOOT_FDT_FILE="ti/k3-am62l3-evm.dts"
diff --git a/config/sources/families/include/k3_common.inc b/config/sources/families/include/k3_common.inc
index 7210a5da66..3745ce4a18 100644
--- a/config/sources/families/include/k3_common.inc
+++ b/config/sources/families/include/k3_common.inc
@@ -59,7 +59,7 @@ function compile_k3_bootgen() {
 	# Source code checkout
 	(fetch_from_repo "https://github.com/TexasInstruments/ti-linux-firmware" "ti-linux-firmware" ${TI_LINUX_FIRMWARE_BRANCH})
 
-	if [[ "${BOARD_NAME}" != "TMDS62LEVM" ]]; then
+	if [[ "${BOOT_SOC}" != "am62l" ]]; then
 		pushd ${SRC}/cache/sources/u-boot-worktree/${BOOTDIR}/${BOOTBRANCH##*:} || exit
 		run_host_command_logged make -j$(nproc) CROSS_COMPILE=arm-linux-gnueabi- ARCH=arm O=build-r5 ${TIBOOT3_BOOTCONFIG}
 		run_host_command_logged make -j$(nproc) CROSS_COMPILE=arm-linux-gnueabi- ARCH=arm O=build-r5 BINMAN_INDIRS=${SRC}/cache/sources/ti-linux-firmware
@@ -79,7 +79,7 @@ function pre_config_uboot_target__build_first_stage() {
 	compile_k3_optee
 	compile_k3_bootgen
 
-	if [[ "${BOARD_NAME}" != "TMDS62LEVM" ]]; then
+	if [[ "${BOOT_SOC}" != "am62l" ]]; then
 		cp ${SRC}/cache/sources/u-boot-worktree/${BOOTDIR}/${BOOTBRANCH##*:}/build-r5/${TIBOOT3_FILE} tiboot3.bin
 		cp ${SRC}/cache/sources/u-boot-worktree/${BOOTDIR}/${BOOTBRANCH##*:}/build-r5/${SYSFW_FILE} sysfw.itb || true
 	fi
diff --git a/config/sources/families/k3.conf b/config/sources/families/k3.conf
index 620d0218c2..33b47db780 100644
--- a/config/sources/families/k3.conf
+++ b/config/sources/families/k3.conf
@@ -45,9 +45,9 @@ case "${BRANCH}" in
 
 esac
 
-case "${BOARD}" in
+case "${BOOT_SOC}" in
 
-	tmds62levm)			# update commit sha with each update of "vendor"/"vendor-rt" until 62L ATF in upstream
+	am62l)				# update commit sha with each update of "vendor"/"vendor-rt" until 62L ATF in upstream
 
 		declare -g ATFSOURCE="https://github.com/TexasInstruments/arm-trusted-firmware"
 		if [[ "${BRANCH}" == "vendor" || "${BRANCH}" == "vendor-rt" ]]; then