diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
similarity index 84%
rename from meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb
rename to meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
index 3ca4772100..f4a8b020a8 100644
--- a/meta-oe/recipes-devtools/flatbuffers/flatbuffers_2.0.6.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb
@@ -2,6 +2,9 @@ SUMMARY = "Memory Efficient Serialization Library"
 HOMEPAGE = "https://github.com/google/flatbuffers"
 SECTION = "console/tools"
 LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+require flatbuffers.inc
 
 PACKAGE_BEFORE_PN = "${PN}-compiler"
 
@@ -10,10 +13,6 @@ DEPENDS = "flatbuffers-native"
 RDEPENDS:${PN}-compiler = "${PN}"
 RDEPENDS:${PN}-dev += "${PN}-compiler"
 
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRCREV = "615616cb5549a34bdf288c04bc1b94bd7a65c396"
-SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https"
 S = "${WORKDIR}/git"
 
 CVE_CHECK_IGNORE += "CVE-2020-35864"
diff --git a/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc
new file mode 100644
index 0000000000..ebdd944980
--- /dev/null
+++ b/meta-oe/recipes-devtools/flatbuffers/flatbuffers.inc
@@ -0,0 +1,3 @@
+PV = "2.0.8"
+SRCREV = "06c5c7ed0bd987a918cf88caafb094f22cdd1721"
+SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https"
diff --git a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.7.bb b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
similarity index 72%
rename from meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.7.bb
rename to meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
index 84c80444b7..fb5b86ddea 100644
--- a/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers_2.0.7.bb
+++ b/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb
@@ -2,11 +2,10 @@ SUMMARY = "Memory Efficient Serialization Library - Python3 Modules"
 HOMEPAGE = "https://github.com/google/flatbuffers"
 SECTION = "console/tools"
 LICENSE = "Apache-2.0"
-
 LIC_FILES_CHKSUM = "file://../LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "8367664f15c3ea2ee58c67dacf9d630b49466de5"
-SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https"
+require flatbuffers.inc
+
 S = "${WORKDIR}/git/python"
 
 RDEPENDS:${PN} = "flatbuffers"