diff --git a/meta-sysmocom-bsp/conf/layer.conf b/meta-sysmocom-bsp/conf/layer.conf
index 4ac4a1bf61..ebc850d2d1 100644
--- a/meta-sysmocom-bsp/conf/layer.conf
+++ b/meta-sysmocom-bsp/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILES += "${LAYERDIR}/yocto-shared/*.bbappend"
 BBFILES += "${BBFILES_SYSMOCOM_BSP}"
 
 # selects specific distro or master when DISTRO_VERSION contains SNAPSHOT
-BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5','dora'), ('1.5.1', 'dora'), ('1.5.2', 'dora'), ('1.5.3', 'dora'), ('1.1.2','edison')])[d.getVar('DISTRO_VERSION', True)], 'master']['SNAPSHOT' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend"
+BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5', 'dora'), ('1.1','edison')])[d.getVar('DISTRO_VERSION', True)[0:3]], 'master']['SNAPSHOT' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend"
 
 BBFILE_COLLECTIONS += "sysmocom-bsp"
 BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/"
diff --git a/meta-sysmocom-bsp/conf/machine/sysmocom-bsc.conf b/meta-sysmocom-bsp/conf/machine/sysmocom-bsc.conf
index de586f1663..49b5d30a58 100644
--- a/meta-sysmocom-bsp/conf/machine/sysmocom-bsc.conf
+++ b/meta-sysmocom-bsp/conf/machine/sysmocom-bsc.conf
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
 PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/kernel = "${@ dict([('1.5','linux-sysmocom'), ('1.5.1', 'linux-sysmocom'), ('1.5.1', 'linux-sysmocom'), ('1.1.2','linux')])[d.getVar('DISTRO_VERSION', True)]}"
+PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}"
 
 require conf/machine/include/tune-geode.inc
 
diff --git a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
index b21aef1b6a..d1bfdd4034 100644
--- a/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
+++ b/meta-sysmocom-bsp/recipes-apps/tasks/task-sysmocom-feed.bb
@@ -3,10 +3,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r7"
+PR = "r8"
 
 RDEPENDS_${PN} = "\
 	task-sysmocom-tools \
 	task-sysmocom-debug \
 	minicom vlan patch procps psmisc \
-	ppp rsync sed usbutils "
+	ppp rsync sed usbutils openvpn"
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb
index 39a92bc6a6..5ee257df75 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_3.11.bb
@@ -1,8 +1,7 @@
 COMPATIBLE_MACHINE = "(sysmobts-v2|sysmobts-2050)"
 PACKAGE_ARCH = "sysmobts-v2"
 FIRMWARE-VERSION = "superfemto_v${PV}"
-PR = "r0.${INC_PR}"
-RRCONFLICTS_${PN} = "osmo-bts (< 0.4.2)"
+PR = "r1.${INC_PR}"
 
 require ${PN}.inc
 
diff --git a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index 23e1a4ef30..dde9d34575 100644
--- a/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
 SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/features/handover;name=osmobts;destsuffix=git \
            git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
-SRCREV_osmobts = "bc24955e91f050e904851f589400eac4c3443917"
-SRCREV_openbsc = "a5cae441e29b85a3f612168106ed61e769b253d7"
+SRCREV_osmobts = "a19912db347af14dd7eec0fea5c897875f1ddf5a"
+SRCREV_openbsc = "9b6258059598e1220c0af447c476c205eba619ee"
 PV = "0.4.3+git${SRCPV}"
-PR = "r12.${META_TELEPHONY_OSMO_INC}"
+PR = "r13.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
 SRCREV_FORMAT = "openbsc-rosmobts"