diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index 02ca39cf6..06bd2b93b 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -85,19 +85,20 @@
     enabled: yes
     state: stopped
 
+
 - 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 }}"
-  when: kolibri_provision | bool
+  when: kolibri_provision and is_rpi
 
 - 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 }}"
-  when: kolibri_provision | bool
+  when: kolibri_provision and is_rpi
 
 - name: Create Kolibri default facility name, admin account and language
   shell: >
@@ -108,7 +109,28 @@
   ignore_errors: yes
   become: yes
   become_user: "{{ kolibri_user }}"
-  when: kolibri_provision | bool
+  when: kolibri_provision and is_rpi
+
+
+- name: Run Kolibri migrations (WHY? WHAT DOES THIS DO?)
+  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" manage migrate
+  ignore_errors: yes
+  when: kolibri_provision and not is_rpi
+
+- name: Set Kolibri default language
+  shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
+  ignore_errors: yes
+  when: kolibri_provision and not is_rpi
+
+- name: Create Kolibri default facility name, admin account and language
+  shell: >
+    export KOLIBRI_HOME="{{ kolibri_home }}" &&
+    "{{ kolibri_exec_path }}" manage provisiondevice --facility "{{ kolibri_facility }}"
+    --superusername "{{ kolibri_admin_user }}" --superuserpassword "{{ kolibri_admin_password }}"
+    --preset "{{ kolibri_preset }}" --language_id "{{ kolibri_language }}" --verbosity 0 --noinput
+  ignore_errors: yes
+  when: kolibri_provision and not is_rpi
+
 
 - name: chown -R {{ kolibri_user }}:{{ apache_user }} {{ kolibri_home }}
   file: