diff --git a/recipes-kernel/kernel-modules/cryptodev-module_%.bbappend b/recipes-kernel/kernel-modules/cryptodev-module_%.bbappend
new file mode 100644
index 0000000..628b4b8
--- /dev/null
+++ b/recipes-kernel/kernel-modules/cryptodev-module_%.bbappend
@@ -0,0 +1,2 @@
+# We are building one kernel for all machines with the same architecture
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
diff --git a/recipes-kernel/kernel-modules/mac80211_%.bbappend b/recipes-kernel/kernel-modules/mac80211_%.bbappend
new file mode 100644
index 0000000..628b4b8
--- /dev/null
+++ b/recipes-kernel/kernel-modules/mac80211_%.bbappend
@@ -0,0 +1,2 @@
+# We are building one kernel for all machines with the same architecture
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
diff --git a/recipes-kernel/kernel-modules/wakeup-timer_1.0.bb b/recipes-kernel/kernel-modules/wakeup-timer_1.0.bb
index e1beb60..f76cc76 100644
--- a/recipes-kernel/kernel-modules/wakeup-timer_1.0.bb
+++ b/recipes-kernel/kernel-modules/wakeup-timer_1.0.bb
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 
 inherit module
 
+# We are building one kernel for all machines with the same architecture
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 PV = "1.0.0"
 SRCREV ?= "1711171ae3bcc9f804d7973f4068cdd7cade78d0"
 
diff --git a/recipes-kernel/system-state-framework/ssc-broker-driver_git.bb b/recipes-kernel/system-state-framework/ssc-broker-driver_git.bb
index ba64b5d..06c6bf7 100644
--- a/recipes-kernel/system-state-framework/ssc-broker-driver_git.bb
+++ b/recipes-kernel/system-state-framework/ssc-broker-driver_git.bb
@@ -9,6 +9,9 @@ inherit module
 
 KERNEL_MODULE_AUTOLOAD += "broker"
 
+# We are building one kernel for all machines with the same architecture
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 PV = "1.0.0"
 SRCREV ?= "4950e67e4a94bde44f8cf7a8c3f0c8eed8d18ad9"
 
diff --git a/recipes-kernel/system-state-framework/ssc-extmod-driver_git.bb b/recipes-kernel/system-state-framework/ssc-extmod-driver_git.bb
index 44f63ec..8df5701 100644
--- a/recipes-kernel/system-state-framework/ssc-extmod-driver_git.bb
+++ b/recipes-kernel/system-state-framework/ssc-extmod-driver_git.bb
@@ -12,6 +12,9 @@ inherit module
 
 KERNEL_MODULE_AUTOLOAD += "extmod"
 
+# We are building one kernel for all machines with the same architecture
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 PV = "1.0.0"
 SRCREV ?= "916fb314511674363cf3a8f6d0bccc092cb00efc"
 
diff --git a/recipes-kernel/system-state-framework/ssc-sysstate-driver_git.bb b/recipes-kernel/system-state-framework/ssc-sysstate-driver_git.bb
index 70a9a7f..e10f177 100644
--- a/recipes-kernel/system-state-framework/ssc-sysstate-driver_git.bb
+++ b/recipes-kernel/system-state-framework/ssc-sysstate-driver_git.bb
@@ -12,6 +12,9 @@ inherit module
 
 KERNEL_MODULE_AUTOLOAD += "sysstate"
 
+# We are building one kernel for all machines with the same architecture
+PACKAGE_ARCH = "${TUNE_PKGARCH}"
+
 PV = "1.0.0"
 SRCREV ?= "19a75e6acbb5541c905ecdfc63ddba1591a619bf"