diff --git a/config/boards/sk-am62-sip.conf b/config/boards/sk-am62-sip.conf
index f508fd76ec..2dc50838d7 100644
--- a/config/boards/sk-am62-sip.conf
+++ b/config/boards/sk-am62-sip.conf
@@ -15,6 +15,6 @@ KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
 KERNEL_TEST_TARGET="vendor"
 SERIALCON="ttyS2"
 ATF_BOARD="lite"
-ATF_EXTRA_ARGS="BL32_BASE=0x80080000 PRELOADED_BL33_BASE=0x82000000"    # Manual memory region definitions required for fixed 512MB RAM
-OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1 CFG_TZDRAM_START=0x80080000"       # See U-Boot docs for more info: https://docs.u-boot.org/en/latest/board/ti/am6254atl_sk.html#a53-spl-ddr-memory-layout
+ATF_ARGS="BL32_BASE=0x80080000 PRELOADED_BL33_BASE=0x82000000"      # Manual memory region definitions required for fixed 512MB RAM
+OPTEE_ARGS="CFG_TEE_CORE_LOG_LEVEL=1 CFG_TZDRAM_START=0x80080000"   # See U-Boot docs for more info: https://docs.u-boot.org/en/latest/board/ti/am6254atl_sk.html#a53-spl-ddr-memory-layout
 OPTEE_PLATFORM="k3-am62x"
diff --git a/config/boards/sk-am68.conf b/config/boards/sk-am68.conf
index 371d45305d..8f09d1fd11 100644
--- a/config/boards/sk-am68.conf
+++ b/config/boards/sk-am68.conf
@@ -15,6 +15,6 @@ KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
 KERNEL_TEST_TARGET="vendor"
 SERIALCON="ttyS2"
 ATF_BOARD="generic"
-ATF_K3_USART_OFFSET="K3_USART=0x8"
+ATF_ARGS="K3_USART=0x8"
 OPTEE_ARGS="CFG_CONSOLE_UART=0x8"
 OPTEE_PLATFORM="k3-j784s4"
diff --git a/config/boards/sk-am69.conf b/config/boards/sk-am69.conf
index 88facec538..8a3093d1cf 100644
--- a/config/boards/sk-am69.conf
+++ b/config/boards/sk-am69.conf
@@ -15,6 +15,6 @@ KERNEL_TARGET="vendor,vendor-rt,vendor-edge,edge"
 KERNEL_TEST_TARGET="vendor"
 SERIALCON="ttyS2"
 ATF_BOARD="j784s4"
-ATF_K3_USART_OFFSET="K3_USART=0x8"
+ATF_ARGS="K3_USART=0x8"
 OPTEE_ARGS="CFG_CONSOLE_UART=0x8"
 OPTEE_PLATFORM="k3-j784s4"
diff --git a/config/sources/families/include/k3_common.inc b/config/sources/families/include/k3_common.inc
index b43fae4f9c..d9f4d3bee1 100644
--- a/config/sources/families/include/k3_common.inc
+++ b/config/sources/families/include/k3_common.inc
@@ -42,7 +42,7 @@ case "${BRANCH}" in
 esac
 
 ATF_PLAT="k3"
-ATF_TARGET_MAP="PLAT=$ATF_PLAT TARGET_BOARD=$ATF_BOARD ${SPD_OPTEED} ${ATF_K3_USART_OFFSET} ${ATF_EXTRA_ARGS[@]} all;;build/$ATF_PLAT/$ATF_BOARD/release/bl31.bin:bl31.bin ${EXTRA_ATF_TARGETS}"
+ATF_TARGET_MAP="PLAT=$ATF_PLAT TARGET_BOARD=$ATF_BOARD ${SPD_OPTEED} ${ATF_ARGS} all;;build/$ATF_PLAT/$ATF_BOARD/release/bl31.bin:bl31.bin ${EXTRA_ATF_TARGETS}"
 
 UBOOT_TARGET_MAP="BL31=bl31.bin ${EXTRA_BOOT_ARGS} TEE=${SRC}/cache/sources/optee-os/out/arm-plat-k3/core/tee-raw.bin BINMAN_INDIRS=${SRC}/cache/sources/ti-linux-firmware all;;tiboot3.bin ${SYSFW_FILE:+sysfw.itb} tispl.bin u-boot.img"