diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index c736c1623..328aa3eef 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -24,8 +24,8 @@ DEFAULTTUNE_mx8 ?= "aarch64"
 
 INHERIT += "machine-overrides-extender"
 
-MACHINEOVERRIDES_EXTENDER_mx6q   = "imxfbdev:imxipu:imxvpu:imxvpucnm:imxgpu:imxgpu2d:imxdpublit:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxfbdev:imxipu:imxpxp:imxvpu:imxvpucnm:imxgpu:imxgpu2d:imxdpublit:imxgpu3d:imxepdc"
+MACHINEOVERRIDES_EXTENDER_mx6q   = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
 MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxfbdev:imxpxp"
 MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
 MACHINEOVERRIDES_EXTENDER_mx8mn  = "imxdrm:imxgpu:imxgpu3d"
@@ -45,21 +45,23 @@ MACHINE_SOCARCH_SUFFIX_mx8mm  = "-mx8mm"
 MACHINE_ARCH_FILTER = "virtual/kernel"
 MACHINE_SOCARCH_FILTER_append_imxvpu = " \
     imx-codec \
-    imx-vpu \
     imx-vpuwrap \
     libimxvpuapi \
+    virtual/imxvpu \
 "
 MACHINE_SOCARCH_FILTER_append_imxgpu = " \
     virtual/egl \
     virtual/mesa \
-    virtual/libg2d \
-    libgal-imx \
     virtual/libopenvg \
+    libdrm \
     cairo \
     opencv \
+    libgal-imx \
     pango \
 "
-
+MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \
+    virtual/libg2d \
+"
 MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \
     virtual/libgl \
     virtual/libgles1 \
@@ -70,21 +72,20 @@ MACHINE_SOCARCH_FILTER_append_mx6q = " \
     opencl-headers \
 "
 MACHINE_SOCARCH_FILTER_append_mx8 = " \
-    virtual/libopenvx \
     virtual/opencl-icd \
     opencl-headers \
 "
-MACHINE_SOCARCH_FILTER_append_imxpxp = " \
-    imx-codec \
+MACHINE_SOCARCH_FILTER_append_mx8qm = " \
+    virtual/libopenvx \
 "
 
 INHERIT += "fsl-dynamic-packagearch"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \
-    libimxvpuapi->imx-vpu \
-    imx-vpuwrap->imx-vpu \
-    imx-codec->imx-vpu \
-    imx-test->imx-vpu \
+    libimxvpuapi->virtual/imxvpu \
+    imx-vpuwrap->virtual/imxvpu \
+    imx-codec->virtual/imxvpu \
+    imx-test->virtual/imxvpu \
 "
 
 # Extra udev rules
@@ -99,10 +100,8 @@ MACHINE_GSTREAMER_1_0_PLUGIN_mx6ul ?= "imx-gst1.0-plugin imx-gst1.0-plugin-gplay
 MACHINE_GSTREAMER_1_0_PLUGIN_mx8 ?= "imx-gst1.0-plugin imx-gst1.0-plugin-gplay imx-gst1.0-plugin-grecorder"
 
 # Determines if the SoC has support for Vivante kernel driver
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT       = "0"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6q  = "1"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx6dl = "1"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_mx8   = "1"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT        = "0"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1"
 
 # Handle Vivante kernel driver setting:
 #   0 - machine does not have Vivante GPU driver support