diff --git a/conf/machine/imx6guf.conf b/conf/machine/imx6guf.conf
index 7c183a106d58d0125a777b9724a4c11beef0ec47..2371646ba0edfed159f190d3b0c80eee005a1237 100644
--- a/conf/machine/imx6guf.conf
+++ b/conf/machine/imx6guf.conf
@@ -6,7 +6,7 @@
 require include/seconorth-machine.inc
 require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
-MACHINEOVERRIDES =. "imxipu:imxvpu:imxgpu2d:imxgpu3d:"
+MACHINEOVERRIDES =. "imxipu:imxvpu:imxgpu2d:imxgpu3d:mx6:"
 SOC_FAMILY = "imx:mx6:mx6q"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
diff --git a/conf/machine/imx6ullguf.conf b/conf/machine/imx6ullguf.conf
index 91747ee6b89f9c06ed568199b114dd5d55186f88..1d97ff0d80d40d9057ea0af58b143d625c265634 100644
--- a/conf/machine/imx6ullguf.conf
+++ b/conf/machine/imx6ullguf.conf
@@ -6,7 +6,7 @@
 require include/seconorth-machine.inc
 require conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
-MACHINEOVERRIDES =. "imxpxp:"
+MACHINEOVERRIDES =. "imxpxp:mx6:mx6ull:"
 SOC_FAMILY = "imx:mx6:mx6ull"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
diff --git a/conf/machine/include/seconorth-machine.inc b/conf/machine/include/seconorth-machine.inc
index 1005ed920612c3bb0713a22e632ee6361e7f6719..6b96399ecfa07c1fac6afd0fa287c45670277ebb 100644
--- a/conf/machine/include/seconorth-machine.inc
+++ b/conf/machine/include/seconorth-machine.inc
@@ -7,6 +7,13 @@ KERNEL_IMAGETYPE = "uImage"
 KBUILD_BUILD_USER := "support"
 KBUILD_BUILD_HOST := "seco.com"
 
+# The MACHINEOVERRIDES_EXTENDER_FILTER_OUT is the filter that removes
+# the old machine overrides for the NXP SoCs (e.g. mx6 or mx8m).
+# Since we use these overrides frequently and the new overrides are
+# quite long (mx8m-generic-bsp, etc.) we keep them for now.
+# For more info see meta-freescale/conf/machine/include/imx-base.inc.
+MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " "
+
 MACHINE_EXTRA_RRECOMMENDS:append = " \
     gfxml2dto \
     kernel-modules \