diff --git a/conf/machine/sysmocom-bsc.conf b/conf/machine/sysmocom-bsc.conf
index 7d5601a..8476894 100644
--- a/conf/machine/sysmocom-bsc.conf
+++ b/conf/machine/sysmocom-bsc.conf
@@ -8,7 +8,8 @@ PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
+PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
 
 require conf/machine/include/tune-geode.inc
 
diff --git a/conf/machine/sysmocom-idu.conf b/conf/machine/sysmocom-idu.conf
index 5827bc7..c1a8891 100644
--- a/conf/machine/sysmocom-idu.conf
+++ b/conf/machine/sysmocom-idu.conf
@@ -10,7 +10,8 @@ PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom"
+PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}"
 
 MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"