diff --git a/feeds/ucentral/ucentral-client/Makefile b/feeds/ucentral/ucentral-client/Makefile
index e46174e06..4d5f53763 100644
--- a/feeds/ucentral/ucentral-client/Makefile
+++ b/feeds/ucentral/ucentral-client/Makefile
@@ -4,6 +4,7 @@ PKG_NAME:=ucentral-client
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git
+PKG_MIRROR_HASH:=38d770883713edfcede3d113df1b2dcc408f92ea19f752dde9a620667fa9c3bc
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-06-22
 PKG_SOURCE_VERSION:=8f5ab3f8fe87cad5c3a6c56463294c946459c725
diff --git a/patches/base/0029-ugps-update-to-latest-HEAD.patch b/patches/base/0029-ugps-update-to-latest-HEAD.patch
new file mode 100644
index 000000000..8d53eeba1
--- /dev/null
+++ b/patches/base/0029-ugps-update-to-latest-HEAD.patch
@@ -0,0 +1,62 @@
+From 11a8e36bf029d575ff7bfafe6226f91abc74ff5a Mon Sep 17 00:00:00 2001
+From: John Crispin <john@phrozen.org>
+Date: Fri, 27 Jan 2023 13:42:32 +0100
+Subject: [PATCH] ugps: update to latest HEAD
+
+Signed-off-by: John Crispin <john@phrozen.org>
+---
+ package/utils/ugps/Makefile         | 5 ++---
+ package/utils/ugps/files/gps.config | 3 ++-
+ package/utils/ugps/files/ugps.init  | 2 ++
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
+index c70a7b7ea6..ab3f852b0d 100644
+--- a/package/utils/ugps/Makefile
++++ b/package/utils/ugps/Makefile
+@@ -12,9 +12,8 @@ PKG_RELEASE:=$(AUTORELEASE)
+ 
+ PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
+ PKG_SOURCE_PROTO:=git
+-PKG_SOURCE_DATE:=2021-06-08
+-PKG_SOURCE_VERSION:=5e88403fc0d39ae8a270d2c6c6e9c8a4d5232cf3
+-PKG_MIRROR_HASH:=a3dfc2cc6def3b634d8b7cda9139926be3d876cf2faa5251c4821987954442a5
++PKG_SOURCE_DATE:=2021-07-19
++PKG_SOURCE_VERSION:=a8171a07193351a9125024d5c759c0ebd6a6895c
+ 
+ PKG_MAINTAINER:=John Crispin <john@phrozen.org>
+ PKG_LICENSE:=GPL-2.0+
+diff --git a/package/utils/ugps/files/gps.config b/package/utils/ugps/files/gps.config
+index 01559f7a9c..1c1cfc27c0 100644
+--- a/package/utils/ugps/files/gps.config
++++ b/package/utils/ugps/files/gps.config
+@@ -1,4 +1,5 @@
+ config gps
+-	option	'tty'	'ttyACM0'
++	option	'tty'		'ttyACM0'
+ 	option	'adjust_time'	'1'
+ 	option	'disabled'	'1'
++	option	'baudrate'	'2400'
+diff --git a/package/utils/ugps/files/ugps.init b/package/utils/ugps/files/ugps.init
+index 77c3603066..209e77fc55 100644
+--- a/package/utils/ugps/files/ugps.init
++++ b/package/utils/ugps/files/ugps.init
+@@ -13,6 +13,7 @@ service_triggers() {
+ start_service() {
+ 	local tty="$(uci get gps.@gps[-1].tty)"
+ 	local atime="$(uci get gps.@gps[-1].adjust_time)"
++	local baudrate="$(uci get gps.@gps[-1].baudrate)"
+ 	local disabled="$(uci get gps.@gps[-1].disabled || echo 0)"
+ 
+ 	[ "$disabled" == "0" ] || return
+@@ -30,6 +31,7 @@ start_service() {
+ 	procd_open_instance
+ 	procd_set_param command "$PROG"
+ 	[ "$atime" -eq 0 ] || procd_append_param command "-a"
++	[ -z "$baudrate" ] || procd_append_param command "-b" "$baudrate"
+ 	procd_append_param command "$tty"
+ 	procd_set_param respawn
+ 	procd_close_instance
+-- 
+2.34.1
+
diff --git a/patches/rest/0021-ugps-update-to-latest-HEAD.patch b/patches/rest/0021-ugps-update-to-latest-HEAD.patch
deleted file mode 100644
index bdec92d51..000000000
--- a/patches/rest/0021-ugps-update-to-latest-HEAD.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6e5fd4e18759885bd25aa182d5cc7ce1c7f8eeea Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 19 Jun 2021 16:00:43 +0200
-Subject: [PATCH 21/43] ugps: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/utils/ugps/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
-index c70a7b7ea6..389138d1dd 100644
---- a/package/utils/ugps/Makefile
-+++ b/package/utils/ugps/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
- 
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
- PKG_SOURCE_PROTO:=git
--PKG_SOURCE_DATE:=2021-06-08
--PKG_SOURCE_VERSION:=5e88403fc0d39ae8a270d2c6c6e9c8a4d5232cf3
--PKG_MIRROR_HASH:=a3dfc2cc6def3b634d8b7cda9139926be3d876cf2faa5251c4821987954442a5
-+PKG_SOURCE_DATE:=2021-07-19
-+PKG_SOURCE_VERSION:=350b960b6f8b08409dcef719ef1e1e0c8911040f
-+PKG_MIRROR_HASH:=94d489072f8fccc26f624c3d3c65e7cb40e4b6267df5fb39d4e0e78469006bde
- 
- PKG_MAINTAINER:=John Crispin <john@phrozen.org>
- PKG_LICENSE:=GPL-2.0+
--- 
-2.25.1
-