diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc
index a35f1943c..f2ab4d4c9 100644
--- a/meta-digi-arm/conf/machine/include/ccardimx28.inc
+++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc
@@ -40,11 +40,11 @@ MACHINE_FEATURES += "alsa touchscreen"
 
 # Variant configuration
 
-MACHINE_FEATURES_web1 += "wifi ext-eth bluetooth 1-wire"
-MACHINE_FEATURES_web += "wifi ext-eth bluetooth"
-MACHINE_FEATURES_wb += "wifi bluetooth"
-MACHINE_FEATURES_w += "wifi"
-MACHINE_FEATURES_e += "ext-eth"
+MACHINE_FEATURES_append_web1 = " wifi ext-eth bluetooth 1-wire"
+MACHINE_FEATURES_append_web = " wifi ext-eth bluetooth"
+MACHINE_FEATURES_append_wb = " wifi bluetooth"
+MACHINE_FEATURES_append_w = " wifi"
+MACHINE_FEATURES_append_e = " ext-eth"
 
 # Variants for different CPU speed
 #UBOOT_CONFIG_VARIANT = "261MHz"
diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc
index 636a7e195..b2289423c 100644
--- a/meta-digi-arm/conf/machine/include/ccimx51.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx51.inc
@@ -43,18 +43,19 @@ module_autoload_pmic_battery = "pmic_battery"
 # w128a		Y	N	128	Y	N	N
 
 
-MACHINE_FEATURES_wagv += "wifi accelerometer accel-video accel-graphics"
-MACHINE_FEATURES_weagv += "wifi ext-eth accelerometer accel-video accel-graphics"
+MACHINE_FEATURES_append_wagv = " wifi accelerometer accel-video accel-graphics"
+MACHINE_FEATURES_append_weagv = " wifi ext-eth accelerometer accel-video accel-graphics"
 UBOOT_CONFIG_VARIANT_weagv = "ext_eth"
-MACHINE_FEATURES_w128agv += "wifi accelerometer accel-video accel-graphics"
+MACHINE_FEATURES_append_w128agv = " wifi accelerometer accel-video accel-graphics"
 UBOOT_CONFIG_VARIANT_w128agv = "128sdram"
-MACHINE_FEATURES_eavg += "ext-eth accelerometer accel-video accel-graphics"
-MACHINE_FEATURES_agv += "accelerometer accel-video accel-graphics"
-MACHINE_FEATURES_w += "wifi"
+MACHINE_FEATURES_append_eavg = " ext-eth accelerometer accel-video accel-graphics"
+MACHINE_FEATURES_append_agv = " accelerometer accel-video accel-graphics"
+MACHINE_FEATURES_append_w = " wifi"
 UBOOT_CONFIG_VARIANT_128 = "128sdram"
-MACHINE_FEATURES_128avg += "accelerometer accel-video accel-graphics"
+MACHINE_FEATURES_append_128avg = " accelerometer accel-video accel-graphics"
 UBOOT_CONFIG_VARIANT_128avg = "128sdram"
-MACHINE_FEATURES_128a += "accelerometer"
+MACHINE_FEATURES_append_128a = " accelerometer"
 UBOOT_CONFIG_VARIANT_128a = "128sdram"
-MACHINE_FEATURES_w128a += "wifi accelerometer"
+MACHINE_FEATURES_append_w128a = " wifi accelerometer"
 UBOOT_CONFIG_VARIANT_w128a = "128sdram"
+
diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc
index cc8ed72a7..a61dc2508 100644
--- a/meta-digi-arm/conf/machine/include/ccimx53.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx53.inc
@@ -44,14 +44,15 @@ MACHINE_FEATURES += "accelerometer"
 
 # Variant configuration
 
-MACHINE_FEATURES_we += "wifi ext-eth"
-UBOOT_CONFIG_VARIANT_we = "ext_eth"
-MACHINE_FEATURES_w += "wifi"
-MACHINE_FEATURES_w128 += "wifi"
+MACHINE_FEATURES_append_we = " wifi ext-eth"
+UBOOT_CONFIG_VARIANT_append_we = " ext_eth"
+MACHINE_FEATURES_append_w = " wifi"
+MACHINE_FEATURES_append_w128 = " wifi"
 UBOOT_CONFIG_VARIANT_w128 = "128sdram"
-MACHINE_FEATURES_e += "ext-ext"
+MACHINE_FEATURES_append_e = " ext-ext"
 UBOOT_CONFIG_VARIANT_e = "ext_eth"
 UBOOT_CONFIG_VARIANT_4k = "4Kpage"
-MACHINE_FEATURES_e += "ext-eth"
+MACHINE_FEATURES_append_e = " ext-eth"
 UBOOT_CONFIG_VARIANT_e = "ext_eth"
 UBOOT_CONFIG_VARIANT_128 = "128sdram"
+