diff --git a/roles/minetest/templates/minetest-serve.service.j2 b/roles/minetest/templates/minetest-serve.service.j2
index f7eb56b39..7755242d1 100644
--- a/roles/minetest/templates/minetest-serve.service.j2
+++ b/roles/minetest/templates/minetest-serve.service.j2
@@ -4,9 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-User={{ minetest_runas_user }}
-Group={{ minetest_runas_group }}
-WorkingDirectory=/library/games/minetest
+WorkingDirectory={{ minetest_working_dir }}
 ExecStart={{ minetest_server_bin }} --port {{ minetest_port }} --config {{ minetest_config_file }} --logfile /var/log/minetest/minetest.log --world {{ minetest_world_dir }}
 Restart=on-abort