diff --git a/contrib/systemd/osmo-gbproxy.service b/contrib/systemd/osmo-gbproxy.service
index a0b7829d..6655d911 100644
--- a/contrib/systemd/osmo-gbproxy.service
+++ b/contrib/systemd/osmo-gbproxy.service
@@ -4,6 +4,8 @@ Description=Osmocom Gb proxy
 [Service]
 Type=simple
 ExecStart=/usr/bin/osmo-gbproxy -c /etc/osmocom/osmo-gbproxy.cfg
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
 RestartSec=2
 RestartPreventExitStatus=1