diff --git a/roles/nodered/templates/node-red.service.j2 b/roles/nodered/templates/nodered.service.j2
similarity index 88%
rename from roles/nodered/templates/node-red.service.j2
rename to roles/nodered/templates/nodered.service.j2
index aa35f8d80..547062ee5 100644
--- a/roles/nodered/templates/node-red.service.j2
+++ b/roles/nodered/templates/nodered.service.j2
@@ -19,9 +19,15 @@ SyslogIdentifier=node-red
 StandardOutput=syslog
 
 # non-root user to run as
+{% if is_rpi %}
+WorkingDirectory=/home/pi/
+User=pi
+Group=pi
+{% else %}
 WorkingDirectory=/home/nodered/
 User=nodered
 Group=nodered
+{% endif %}
 
 [Install]
 WantedBy=multi-user.target