diff --git a/recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.3.bb b/recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.3.bb
index a02a5d3..c8960a8 100644
--- a/recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.3.bb
+++ b/recipes-bsp/drivers/gcnano-driver-stm32mp_6.4.3.bb
@@ -1,5 +1,5 @@
 SUMMARY = "GCNano kernel drivers"
-LICENSE = "GPLv1 & MIT"
+LICENSE = "GPL-1.0-only & MIT"
 # Note get md5sum with: $ head -n 53 Makefile | md5sum
 LIC_FILES_CHKSUM = "file://Makefile;endline=53;md5=3ad4e99418a2e0f339ecdc29ac648351"
 
diff --git a/recipes-bsp/drivers/sysdig-driver_git.bb b/recipes-bsp/drivers/sysdig-driver_git.bb
index 99d99f5..9295755 100644
--- a/recipes-bsp/drivers/sysdig-driver_git.bb
+++ b/recipes-bsp/drivers/sysdig-driver_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Sysdig is open source, system-level exploration: capture \
 system state and activity from a running Linux instance, then save, \
 filter and analyze."
 HOMEPAGE = "http://www.sysdig.org/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f8fee3d59797546cffab04f3b88b2d44"
 
 SRC_URI = "git://github.com/draios/sysdig.git;protocol=https"
diff --git a/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.10.inc b/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.10.inc
index eb2506a..2f47c14 100644
--- a/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.10.inc
+++ b/recipes-bsp/u-boot/u-boot-stm32mp-common_2020.10.inc
@@ -3,7 +3,7 @@
 HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
 SECTION = "bootloaders"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
 DEPENDS += "dtc-native bc-native"
diff --git a/recipes-bsp/u-boot/u-boot-stm32mp_2020.10.bb b/recipes-bsp/u-boot/u-boot-stm32mp_2020.10.bb
index f0a94bd..cb498af 100644
--- a/recipes-bsp/u-boot/u-boot-stm32mp_2020.10.bb
+++ b/recipes-bsp/u-boot/u-boot-stm32mp_2020.10.bb
@@ -2,7 +2,7 @@ require u-boot-stm32mp-common_${PV}.inc
 require u-boot-stm32mp.inc
 
 SUMMARY = "Universal Boot Loader for embedded devices for stm32mp"
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 
 PROVIDES += "u-boot"
 RPROVIDES:${PN} += "u-boot"
diff --git a/recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9.bb b/recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9.bb
index d88ff46..56587d9 100644
--- a/recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9.bb
+++ b/recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi-native_9.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Baremetal GCC for ARM"
-LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
+LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
 
 require gcc-arm-none-eabi_${PV}.inc
 
diff --git a/recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi_9.inc b/recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi_9.inc
index 8648c59..b303d9f 100644
--- a/recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi_9.inc
+++ b/recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi_9.inc
@@ -1,5 +1,5 @@
 SUMMARY = "Baremetal GCC for ARM"
-LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
+LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
 
 LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5"
 
diff --git a/recipes-devtools/gcc-arm-none-eabi/nativesdk-gcc-arm-none-eabi_9.bb b/recipes-devtools/gcc-arm-none-eabi/nativesdk-gcc-arm-none-eabi_9.bb
index 454b970..10416ba 100644
--- a/recipes-devtools/gcc-arm-none-eabi/nativesdk-gcc-arm-none-eabi_9.bb
+++ b/recipes-devtools/gcc-arm-none-eabi/nativesdk-gcc-arm-none-eabi_9.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Baremetal GCC for ARM"
-LICENSE = "GPL-3.0-with-GCC-exception & GPLv3"
+LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
 
 require gcc-arm-none-eabi_${PV}.inc
 
diff --git a/recipes-devtools/openocd/openocd-stm32mp_0.11.0.bb b/recipes-devtools/openocd/openocd-stm32mp_0.11.0.bb
index 753d11e..204ae66 100644
--- a/recipes-devtools/openocd/openocd-stm32mp_0.11.0.bb
+++ b/recipes-devtools/openocd/openocd-stm32mp_0.11.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"
 HOMEPAGE = "http://openocd.org"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 require openocd-stm32mp.inc
diff --git a/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb b/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb
index 3f1e954..32aa744 100644
--- a/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb
+++ b/recipes-devtools/stm32wrapper4dbg/stm32wrapper4dbg_1.0.0.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Wrapper for FSBL to debug TF-A U-Boot and bare metal on STM32MP1"
 SECTION = "devel"
-LICENSE = "GPLv2+ | BSD-3-Clause"
+LICENSE = "GPL-2.0-or-later | BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c996e24cb10a869efb08b521b20242f"
 
 SRC_URI = "git://github.com/STMicroelectronics/stm32wrapper4dbg;protocol=https;branch=master"
diff --git a/recipes-devtools/svd-tools/svd-tools_git.bb b/recipes-devtools/svd-tools/svd-tools_git.bb
index 457cd36..baf6f75 100644
--- a/recipes-devtools/svd-tools/svd-tools_git.bb
+++ b/recipes-devtools/svd-tools/svd-tools_git.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Python script for using CMSIS SVD parser with GDB"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
diff --git a/recipes-extended/sysdig/sysdig-stm32mp_git.bb b/recipes-extended/sysdig/sysdig-stm32mp_git.bb
index 3b66f5f..5336471 100644
--- a/recipes-extended/sysdig/sysdig-stm32mp_git.bb
+++ b/recipes-extended/sysdig/sysdig-stm32mp_git.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Sysdig is open source, system-level exploration: capture \
 system state and activity from a running Linux instance, then save, \
 filter and analyze."
 HOMEPAGE = "http://www.sysdig.org/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f8fee3d59797546cffab04f3b88b2d44"
 
 PROVIDES:append:stm32mpcommon = " sysdig "
diff --git a/recipes-kernel/linux/linux-stm32mp_5.10.bb b/recipes-kernel/linux/linux-stm32mp_5.10.bb
index b6d51ac..964bd95 100644
--- a/recipes-kernel/linux/linux-stm32mp_5.10.bb
+++ b/recipes-kernel/linux/linux-stm32mp_5.10.bb
@@ -1,6 +1,6 @@
 SUMMARY = "Linux STM32MP Kernel"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 #LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"