diff --git a/debian/obs-worker.dir b/debian/obs-worker.dir
new file mode 100644
index 0000000000000000000000000000000000000000..b75510ce9cb3de938dc45f2ab9abb06ed6a059d7
--- /dev/null
+++ b/debian/obs-worker.dir
@@ -0,0 +1 @@
+/run/obs
diff --git a/debian/obs-worker.obsworker.default b/debian/obs-worker.obsworker.default
index dd5f4bd671bce20c34c71f3f61b08fc269826b2d..ed7d4d73d3cf6383edd53465c60db68fec86665c 100644
--- a/debian/obs-worker.obsworker.default
+++ b/debian/obs-worker.obsworker.default
@@ -78,7 +78,7 @@ OBS_WORKER_TEST_MODE=""
 #
 # This is /run by default
 #
-OBS_RUN_DIR="/srv/obs/run"
+OBS_RUN_DIR="/run/obs"
 
 ## Path:        Applications/OBS
 ## Description: The base for OBS logging directory
diff --git a/debian/obs-worker.obsworker.init b/debian/obs-worker.obsworker.init
index cbb5b4405cc2cde1deb13c65efb39b5aa350a5d0..1006e01bfd86ab24739290dd65fd55b79708947f 100755
--- a/debian/obs-worker.obsworker.init
+++ b/debian/obs-worker.obsworker.init
@@ -212,7 +212,7 @@ case "$1" in
     start)
         # reset screenrc
         mkdir -p "$obsrundir"
-        chown obsrun:obsrun "$obsrundir"
+        chown obsworker:obsworker "$obsrundir"
         rm -rf "$workerdir"
         mkdir -p "$workerbootdir"
         echo "zombie on"       > $screenrc