diff --git a/etc/systemd/system/pingfinder.service b/etc/systemd/system/pingfinder.service
index af7d14b..4025882 100644
--- a/etc/systemd/system/pingfinder.service
+++ b/etc/systemd/system/pingfinder.service
@@ -3,5 +3,11 @@ Description=Pingfinder
 
 [Service]
 Type=oneshot
+
+Environment=WARNLOCK=$CACHE_DIRECTORY/warn.lock
+Environment=LOCKFILE=$CACHE_DIRECTORY/exec.lock
 Environment=UUID=[...]
-ExecStart=/opt/pingfinder.sh
+ExecStart=/usr/local/bin/pingfinder.sh
+
+DynamicUser=yes
+CacheDirectory=pingfinder