diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index 02ca39cf6..ae672d9cc 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -1,8 +1,8 @@
-# SEE kolibri_user EXPLANATION IN roles/kolibri/defaults/main.yml
-- name: Override kolibri_user (e.g. from 'kolibri') to 'pi' if Raspberry Pi / Raspbian
-  set_fact:
-    kolibri_user: pi
-  when: is_rpi | bool
+## SEE kolibri_user EXPLANATION IN roles/kolibri/defaults/main.yml
+#- name: Override kolibri_user (e.g. from 'kolibri') to 'pi' if Raspberry Pi / Raspbian
+#  set_fact:
+#    kolibri_user: pi
+#  when: is_rpi | bool
 
 - name: Create Linux user {{ kolibri_user }} and add it to groups {{ apache_user }}, disk
   user:
@@ -14,7 +14,7 @@
     shell: /bin/false
     system: yes
     create_home: no
-  when: not is_rpi
+  #when: not is_rpi
 
 #- name: Create {{ kolibri_home }} (for data) and {{ kolibri_venv_path }} (venv for program/config)
 - name: Create {{ kolibri_home }} (for data)
@@ -88,15 +88,15 @@
 - name: Run Kolibri migrations (WHY? WHAT DOES THIS DO?)
   shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" manage migrate
   ignore_errors: yes
-  become: yes
-  become_user: "{{ kolibri_user }}"
+  #become: yes
+  #become_user: "{{ kolibri_user }}"
   when: kolibri_provision | bool
 
 - name: Set Kolibri default language
   shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
   ignore_errors: yes
-  become: yes
-  become_user: "{{ kolibri_user }}"
+  #become: yes
+  #become_user: "{{ kolibri_user }}"
   when: kolibri_provision | bool
 
 - name: Create Kolibri default facility name, admin account and language
@@ -106,8 +106,8 @@
     --superusername "{{ kolibri_admin_user }}" --superuserpassword "{{ kolibri_admin_password }}"
     --preset "{{ kolibri_preset }}" --language_id "{{ kolibri_language }}" --verbosity 0 --noinput
   ignore_errors: yes
-  become: yes
-  become_user: "{{ kolibri_user }}"
+  #become: yes
+  #become_user: "{{ kolibri_user }}"
   when: kolibri_provision | bool
 
 - name: chown -R {{ kolibri_user }}:{{ apache_user }} {{ kolibri_home }}