diff --git a/recipes-apps/tasks/task-sysmocom-bts.bb b/recipes-apps/tasks/task-sysmocom-bts.bb
index 79093a8..b9acc81 100644
--- a/recipes-apps/tasks/task-sysmocom-bts.bb
+++ b/recipes-apps/tasks/task-sysmocom-bts.bb
@@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r21"
+PR = "r22"
 
 CALIB = ""
 CALIB_sysmobts-v2 = "sysmobts-calib sysmobts-util"
 
 UTIL = ""
-UTIL_sysmobts-2050 = "sbts2050-util gpsd gps-utils"
+UTIL_sysmobts-v2 = "sbts2050-util gpsd gps-utils"
 
 # TODO: re-add femtobts-calib after it went through the API migration
 RDEPENDS_${PN} = "\
diff --git a/recipes-extra/gpsd/gpsd/sysmobts-2050/gpsd-default b/recipes-extra/gpsd/gpsd/sysmobts-2050/gpsd-default
deleted file mode 100644
index ad4d32a..0000000
--- a/recipes-extra/gpsd/gpsd/sysmobts-2050/gpsd-default
+++ /dev/null
@@ -1,5 +0,0 @@
-# If you must specify a non-NMEA driver, uncomment and modify the next line
-GPSD_SOCKET="/var/run/gpsd.sock"
-GPSD_OPTIONS=""
-GPS_DEVICES="/dev/ttyS2"
-
diff --git a/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default b/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default
index e37c3b5..ad4d32a 100644
--- a/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default
+++ b/recipes-extra/gpsd/gpsd/sysmobts-v2/gpsd-default
@@ -1,5 +1,5 @@
 # If you must specify a non-NMEA driver, uncomment and modify the next line
 GPSD_SOCKET="/var/run/gpsd.sock"
-GPSD_OPTIONS="" 
-GPS_DEVICES="udp://127.0.0.1:12345 udp://127.0.0.1:12346"
+GPSD_OPTIONS=""
+GPS_DEVICES="/dev/ttyS2"