diff --git a/recipes-devtools/riscv-tools/riscv-fesvr.bb b/recipes-devtools/riscv-tools/riscv-fesvr.bb
index bea0914..9a9f575 100644
--- a/recipes-devtools/riscv-tools/riscv-fesvr.bb
+++ b/recipes-devtools/riscv-tools/riscv-fesvr.bb
@@ -1,6 +1,6 @@
 SUMMARY = "RISC-V Front-end Server"
 DESCRIPTION = "RISC-V Front-end Server"
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
 
diff --git a/recipes-devtools/riscv-tools/riscv-spike.bb b/recipes-devtools/riscv-tools/riscv-spike.bb
index 737d1c5..355cc7b 100644
--- a/recipes-devtools/riscv-tools/riscv-spike.bb
+++ b/recipes-devtools/riscv-tools/riscv-spike.bb
@@ -1,6 +1,6 @@
 SUMMARY = "RISC-V Spike ISA Simulator"
 DESCRIPTION = "RISC-V Spike ISA Simulator"
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
 
diff --git a/recipes-kernel/linux/linux-mainline-common.inc b/recipes-kernel/linux/linux-mainline-common.inc
index de1326f..94e6f34 100644
--- a/recipes-kernel/linux/linux-mainline-common.inc
+++ b/recipes-kernel/linux/linux-mainline-common.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "Mainline Linux Kernel"
 SECTION = "kernel"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 inherit kernel