diff --git a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend
index 86f3daa69..ac10b669d 100644
--- a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend
+++ b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_%.bbappend
@@ -1,8 +1,6 @@
 # Copyright (C) 2017-2018 Digi International
 
-VER_DIR = "${@d.getVar('PV', True).split('+git')[0]}"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${VER_DIR}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += " \
     file://0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch \
diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend
index 9cc4e0cb0..90696801e 100644
--- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend
+++ b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend
@@ -1,7 +1,6 @@
 # Copyright (C) 2016-2018 Digi International
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += "file://0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch"
-
 SRC_URI_append_ccimx6 = " file://0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch"