diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index 7c8b055d6..b4324c72d 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -1,3 +1,9 @@
+# SEE kolibri_user EXPLANATION IN roles/kolibri/defaults/main.yml
+- name: Set kolibri_user to pi if Raspberry Pi
+  set_fact:
+    kolibri_user: pi
+  when: is_rpi | bool
+
 - name: Create Linux user {{ kolibri_user }} and add it to groups {{ apache_user }}, disk
   user:
     name: "{{ kolibri_user }}"
@@ -8,6 +14,7 @@
     shell: /bin/false
     system: yes
     create_home: no
+  when: not is_rpi
 
 #- name: Create {{ kolibri_home }} (for data) and {{ kolibri_venv_path }} (venv for program/config)
 - name: Create {{ kolibri_home }} (for data)