diff --git a/local.yml b/local.yml
index 11970083379939d14b878fcc9fb0358edcb93a6a..7e7673cf1d98885e487336758880e1d81a62327c 100644
--- a/local.yml
+++ b/local.yml
@@ -1,5 +1,8 @@
 ---
 - hosts: localhost
+  vars:
+    target_user: pi
+
   pre_tasks:
     # - name: Upgrade packages
     #   become: true
diff --git a/roles/jupyter-lab/files/jupyter.service b/roles/jupyter-lab/files/jupyter.service
index 5b44a741e08dac48e962fd815ab93b500174cab1..cd84905bd1a633123b1364315da0fc883ffacd2c 100644
--- a/roles/jupyter-lab/files/jupyter.service
+++ b/roles/jupyter-lab/files/jupyter.service
@@ -5,9 +5,10 @@ Description=Jupyter Lab
 Type=simple
 PIDFile=/run/jupyter.pid
 # Password: [empty string]
-ExecStart=/usr/bin/python3 -m jupyterlab --ip="0.0.0.0" --notebook-dir=/home/pi/notebooks --no-browser --NotebookApp.password='sha1:9a2d316959ac:843b251c27024afb46174ce40ce0ebebcf29217b'
-User=pi
-Group=pi
+ExecStart=/usr/bin/python3 -m jupyterlab --ip="0.0.0.0"
+--notebook-dir=/home/{{ target_user }}/notebooks --no-browser --NotebookApp.password='sha1:9a2d316959ac:843b251c27024afb46174ce40ce0ebebcf29217b'
+User={{ target_user }}
+Group={{ target_user }}
 Restart=always
 RestartSec=10
 
diff --git a/roles/jupyter-lab/tasks/main.yml b/roles/jupyter-lab/tasks/main.yml
index 6ae98f255535f67a8805d2c9fb4c0c671eeeefd4..adb63c14ad7dc4d79f9191fc89c9adceddeb2333 100644
--- a/roles/jupyter-lab/tasks/main.yml
+++ b/roles/jupyter-lab/tasks/main.yml
@@ -3,10 +3,10 @@
 
 - name: Notebooks dir
   file:
-    path: /home/pi/notebooks
+    path: "/home/{{ target_user }}/notebooks"
     state: directory
-    owner: pi
-    group: pi
+    owner: "{{ target_user }}"
+    group: "{{ target_user }}"
 
 # This should be optimized so that only one check / install is needed
 # Still we should make sure that pip3 is actually installed before trying to use it
@@ -27,7 +27,7 @@
 
 - name: Install systemd service
   become: true
-  copy:
+  template:
     src: files/jupyter.service
     dest: /etc/systemd/system/jupyter.service
     mode: '0644'