diff --git a/recipes-kernel/linux/linux-riscv_4.15.bb b/recipes-kernel/linux/linux-riscv_4.15.bb
index 7952507..a4414c4 100644
--- a/recipes-kernel/linux/linux-riscv_4.15.bb
+++ b/recipes-kernel/linux/linux-riscv_4.15.bb
@@ -1,43 +1,32 @@
 DESCRIPTION = "RISC-V Linux Kernel"
 SECTION = "kernel"
 LICENSE = "GPLv2"
-
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-COMPATIBLE_MACHINE = "(qemuriscv64)"
+inherit kernel
+require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_KERNEL_TYPE ?= "standard"
-# patch version
-PV_append = ".0"
+SRC_URI = "\
+    git://github.com/riscv/riscv-linux.git;branch=${BRANCH} \
+    file://earlyprintk.cfg \
+"
 
-KBRANCH ?= "${BRANCH}"
-KMACHINE ?= "${MACHINE}"
-KMETA = "meta"
-KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
-KCONFIG_MODE="--alldefconfig"
+LINUX_VERSION ?= "4.15"
+LINUX_VERSION_EXTENSION_append = "-riscv"
+
+BRANCH = "riscv-linux-4.15"
+SRCREV = "2b0aa1de45f63535f6d26757aa22b48515289302"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
 
 DEPENDS_append = " libgcc"
 
+KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
+KCONFIG_MODE="--alldefconfig"
+
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}"
 KERNEL_LD_append = " -no-pie"
 
-#KERNEL_FEATURES_append_riscv += " cfg/smp.scc"
+COMPATIBLE_MACHINE = "(qemuriscv64)"
 
-#KERNEL_ALT_IMAGETYPE = ""
-
-#KERNEL_OUTPUT = "vmlinux"
-#KERNEL_IMAGETYPE = "vmlinux"
-
-inherit kernel siteinfo
-
-BRANCH = "riscv-linux-4.15"
-
-SRCREV = "2b0aa1de45f63535f6d26757aa22b48515289302"
-SRCREV_machine = "2b0aa1de45f63535f6d26757aa22b48515289302"
-
-SRC_URI = "git://github.com/riscv/riscv-linux.git;branch=${BRANCH} \
-           file://earlyprintk.cfg \
-          "
-
-require recipes-kernel/linux/linux-yocto.inc
 KERNEL_FEATURES_remove = "features/debug/printk.scc"
diff --git a/recipes-kernel/linux/linux-riscv_4.16.bb b/recipes-kernel/linux/linux-riscv_4.16.bb
index 869a062..256891c 100644
--- a/recipes-kernel/linux/linux-riscv_4.16.bb
+++ b/recipes-kernel/linux/linux-riscv_4.16.bb
@@ -1,36 +1,32 @@
 DESCRIPTION = "RISC-V Linux Kernel"
 SECTION = "kernel"
 LICENSE = "GPLv2"
-
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-COMPATIBLE_MACHINE = "(qemuriscv64)"
+inherit kernel
+require recipes-kernel/linux/linux-yocto.inc
 
-LINUX_KERNEL_TYPE ?= "standard"
-# patch version
-PV_append = "-rc5"
+SRC_URI = "\
+    git://github.com/riscv/riscv-linux.git;branch=${BRANCH} \
+    file://earlyprintk.cfg \
+"
 
-KBRANCH ?= "${BRANCH}"
-KMACHINE ?= "${MACHINE}"
-KMETA = "meta"
-KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
-KCONFIG_MODE="--alldefconfig"
+LINUX_VERSION ?= "4.16-rc5"
+LINUX_VERSION_EXTENSION_append = "-riscv"
+
+BRANCH = "riscv-all"
+SRCREV = "7f82cffaad50273eedb654b58167c662383eac99"
+
+PV = "${LINUX_VERSION}+git${SRCPV}"
 
 DEPENDS_append = " libgcc"
 
+KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
+KCONFIG_MODE="--alldefconfig"
+
 KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}"
 KERNEL_LD_append = " -no-pie"
 
-inherit kernel siteinfo
+COMPATIBLE_MACHINE = "(qemuriscv64)"
 
-BRANCH = "riscv-all"
-
-SRCREV = "7f82cffaad50273eedb654b58167c662383eac99"
-SRCREV_machine = "7f82cffaad50273eedb654b58167c662383eac99"
-
-SRC_URI = "git://github.com/riscv/riscv-linux.git;branch=${BRANCH} \
-           file://earlyprintk.cfg \
-          "
-
-require recipes-kernel/linux/linux-yocto.inc
 KERNEL_FEATURES_remove = "features/debug/printk.scc"