diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
index a9a60b4..5e740db 100644
--- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc
+++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
@@ -5,7 +5,7 @@
 
 DEPENDS = "libosmocore libosmo-netif"
 
-INC_PR="r3.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r4.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
@@ -14,10 +14,14 @@
     "
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
 
-# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340):
 do_install_append() {
+	# StateDirectory requires systemd >= v235, but poky pyro ships with v232 (SYS#6340):
 	sed -i '/^StateDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service"
 	sed -i '/^WorkingDirectory=/d' "${D}${systemd_system_unitdir}/${PN}.service"
+
+	# Run as root (OS#5684):
+	sed -i '/^User=/d' "${D}${systemd_system_unitdir}/${PN}.service"
+	sed -i '/^Group=/d' "${D}${systemd_system_unitdir}/${PN}.service"
 }
 
 PACKAGES =+ "libosmo-mgcp libosmo-mgcp-dev libosmo-mgcp-client libosmo-mgcp-client-dev"