diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 6003314b8..1046ab881 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -1,8 +1,8 @@
 # Digi BSP default providers
 PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-dey"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-dey"
-PREFERRED_PROVIDER_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}"
+PREFERRED_PROVIDER_u-boot ??= "u-boot-dey"
+PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-dey"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-dey"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
 #
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 27369e022..596e2324b 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -9,15 +9,15 @@ XSERVER = "xserver-xorg \
            xf86-input-evdev \
            ${XSERVER_DRIVER}"
 
-# FIXME: Use older versions until Vivante GPU is made compatible
-PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.14.4"
-PREFERRED_VERSION_directfb_mx6 = "1.6.3"
-PREFERRED_VERSION_directfb-examples_mx6 = "1.6.0"
+PREFERRED_VERSION_directfb_mx6 = "1.7.4"
 
 # Ship kernel modules
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 
 # Float-Point setting
+# handled by software
+# DEFAULTTUNE_mx6 ?= "cortexa9-neon"
+# handled by hardware
 DEFAULTTUNE_mx6 ?= "cortexa9hf-neon"
 
 # Sub-architecture support
@@ -25,13 +25,12 @@ MACHINE_SOCARCH ?= ""
 MACHINE_SOCARCH_mx5 = "${TUNE_PKGARCH}-mx5"
 MACHINE_SOCARCH_mx6q = "${TUNE_PKGARCH}-mx6qdl"
 MACHINE_SOCARCH_mx6dl = "${TUNE_PKGARCH}-mx6qdl"
-MACHINE_SOCARCH_mx6sl = "${TUNE_PKGARCH}-mx6sl"
 PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
 MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins"
 MACHINE_SOCARCH_FILTER_append_mx5 = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
-MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
+MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
 
 INHERIT += "fsl-dynamic-packagearch"
 
@@ -43,7 +42,8 @@ MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
 
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
-MACHINE_GSTREAMER_1_0_PLUGIN_mx6 ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gstreamer1.0-plugins-imx-meta"
 
 # mx5 GPU libraries
 GPU_FLAVOUR = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11-', '', d)}"
@@ -52,16 +52,14 @@ PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
 
 # mx6 GPU libraries
-PREFERRED_PROVIDER_virtual/egl_mx6 ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles1_mx6sl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgles2_mx6sl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "gpu-viv-bin-mx6q"
-PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa"
+PREFERRED_PROVIDER_virtual/egl_mx6 ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles1_mx6q ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles1_mx6dl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles2_mx6q ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgles2_mx6dl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgl_mx6q ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libgl_mx6dl ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv"
 
 EXTRA_IMAGEDEPENDS = "u-boot"