diff --git a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
index e332efc..b26e43c 100644
--- a/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
+++ b/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "sysmocom OsmoBTS"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
 
-SRCREV = "1.6.0"
-SRC_URI = "git://gerrit.osmocom.org/osmo-bts;protocol=https;destsuffix=git;tag=${SRCREV};nobranch=1"
-PV = "${SRCREV}+git${SRCPV}"
+SRC_URI = "git://gerrit.osmocom.org/osmo-bts;protocol=https;destsuffix=git"
+SRCREV = "${AUTOREV}"
+PV = "1.6.0+git${SRCPV}"
 PR = "r1.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
index 2cef0c9..d75fa60 100644
--- a/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
+++ b/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Osmocom PCU for sysmoBTS"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "1.2.0"
-SRC_URI = "git://gerrit.osmocom.org/osmo-pcu;protocol=https;branch=master;nobranch=1"
-PV = "${SRCREV}+git${SRCPV}"
+SRC_URI = "git://gerrit.osmocom.org/osmo-pcu;protocol=https;branch=master"
+SRCREV = "${AUTOREV}"
+PV = "1.2.0+git${SRCPV}"
 PR = "r1.${META_TELEPHONY_OSMO_INC}"
 S = "${WORKDIR}/git"