diff --git a/contrib/systemd/osmo-hnodeb.service b/contrib/systemd/osmo-hnodeb.service
index 037e0e8..d7e26d8 100644
--- a/contrib/systemd/osmo-hnodeb.service
+++ b/contrib/systemd/osmo-hnodeb.service
@@ -3,6 +3,8 @@ Description=Osmocom Home NodeB (hNodeB)
 
 [Service]
 Type=simple
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 Restart=always
 ExecStart=/usr/bin/osmo-hnodeb -c /etc/osmocom/osmo-hnodeb.cfg
 RestartSec=2