diff --git a/conf/machine/am335x-nbhw16.conf b/conf/machine/am335x-nbhw16.conf
index 76977b4..66a9391 100644
--- a/conf/machine/am335x-nbhw16.conf
+++ b/conf/machine/am335x-nbhw16.conf
@@ -16,10 +16,10 @@ KERNEL_IMAGETYPE = "zImage"
 UBOOT_MACHINE = "am335x_nbhw16_config"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-netmodule"
 PREFERRED_VERSION_u-boot-netmodule = "v2016.04%"
-SRCREV_pn-u-boot-netmodule = "nbhw16-2016.04"
+BRANCH_pn-u-boot-netmodule = "nbhw16-2016.04"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
-SRCREV_pn-linux-netmodule = "nbhw16-4.4"
+BRANCH_pn-linux-netmodule = "nbhw16-4.4"
 PREFERRED_VERSION_linux = "4.4%"
 
 SERIAL_CONSOLE = "115200 ttyO0"
diff --git a/conf/machine/armada-385-nbhw17-nb2800.conf b/conf/machine/armada-385-nbhw17-nb2800.conf
index 2bfcbc5..9c5c4a9 100644
--- a/conf/machine/armada-385-nbhw17-nb2800.conf
+++ b/conf/machine/armada-385-nbhw17-nb2800.conf
@@ -12,9 +12,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
 KERNEL_DEFCONFIG = "nbhw_defconfig"
 KERNEL_DEVICETREE = "armada-385-nbhw17-nb2800.dtb"
 
-SRCREV_pn-linux-netmodule ?= "nmrouter-4.5"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-netmodule"
 PREFERRED_VERSION_linux ?= "4.5%"
+BRANCH_pn-linux-netmodule = "nmrouter-4.5"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index 87e630c..1b51a75 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -16,7 +16,7 @@ KERNEL_IMAGETYPE = "zImage"
 UBOOT_MACHINE = "am335x_boneblack_config"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
-SRCREV_pn-linux-netmodule = "nbhw16-4.4"
+BRANCH_pn-linux-netmodule = "nbhw16-4.4"
 PREFERRED_VERSION_linux = "4.4%"
 
 SERIAL_CONSOLE = "115200 ttyO0"
diff --git a/recipes-bsp/u-boot/u-boot-netmodule_git.bb b/recipes-bsp/u-boot/u-boot-netmodule_git.bb
index b52b42d..86b720b 100644
--- a/recipes-bsp/u-boot/u-boot-netmodule_git.bb
+++ b/recipes-bsp/u-boot/u-boot-netmodule_git.bb
@@ -2,9 +2,10 @@ require u-boot.inc
 
 DEPENDS += "dtc-native"
 
-SRCREV ??= "master"
+SRCREV ?= "${AUTOREV}"
+BRANCH ?= "master"
 
-SRC_URI = "git://gitolite@git/usr/se/u-boot;protocol=ssh;nobranch=1"
+SRC_URI = "git://gitolite@git/usr/se/u-boot;protocol=ssh;branch=${BRANCH}"
 
 PV = "v2016.04+git${SRCPV}"
 
diff --git a/recipes-kernel/linux/linux-netmodule_git.bb b/recipes-kernel/linux/linux-netmodule_git.bb
index b37500a..019ee84 100755
--- a/recipes-kernel/linux/linux-netmodule_git.bb
+++ b/recipes-kernel/linux/linux-netmodule_git.bb
@@ -8,10 +8,10 @@ DESCRIPTION = "Linux kernel for various NetModule hardware"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-#SRC_URI = "git://git@gitlab.com/eichest/linux.git;protocol=ssh;nobranch=1"
-SRC_URI = "git://gitolite@git/usr/se/linux;protocol=ssh;nobranch=1"
+BRANCH ?= "master"
+SRC_URI = "git://gitolite@git/usr/se/linux;protocol=ssh;branch=${BRANCH}"
 
-SRCREV ??= "master"
+SRCREV ?= "${AUTOREV}"
 PV ?= "4.5-${SRCPV}"
 PV_beaglebone = "4.4-${SRCPV}"
 PV_am335x-nbhw16 = "4.4-${SRCPV}"