diff --git a/roles/kolibri/tasks/main.yml b/roles/kolibri/tasks/main.yml
index 5021a4492..720c6e393 100644
--- a/roles/kolibri/tasks/main.yml
+++ b/roles/kolibri/tasks/main.yml
@@ -20,24 +20,37 @@
     - "{{ kolibri_home }}"         # /library/kolibri
     - "{{ kolibri_venv_path }}"    # /usr/local/kolibri
 
-- name: Install latest Kolibri using pip, to venv
-  pip:
+- name: Install latest Kolibri using apt
+  apt:
     name: kolibri
-    virtualenv: "{{ kolibri_venv_path }}"
-    virtualenv_site_packages: no
     state: latest
     extra_args: --no-cache-dir
-  when: internet_available and not (kolibri_version is defined)
+  when: internet_available and (kolibri_version is undefined)
 
-- name: Install Kolibri {{ kolibri_version }} using pip, to venv
-  pip:
-    name: kolibri
-    virtualenv: "{{ kolibri_venv_path }}"
-    virtualenv_site_packages: no
-    version: "{{ kolibri_version }}"
+- name: Install Kolibri {{ kolibri_version }} using apt
+  apt:
+    name: "kolibri={{ kolibri_version }}"
     extra_args: --no-cache-dir
   when: internet_available and kolibri_version is defined
 
+#- name: Install latest Kolibri using pip, to venv
+#  pip:
+#    name: kolibri
+#    virtualenv: "{{ kolibri_venv_path }}"
+#    virtualenv_site_packages: no
+#    state: latest
+#    extra_args: --no-cache-dir
+#  when: internet_available and (kolibri_version is undefined)
+
+#- name: Install Kolibri {{ kolibri_version }} using pip, to venv
+#  pip:
+#    name: kolibri
+#    virtualenv: "{{ kolibri_venv_path }}"
+#    virtualenv_site_packages: no
+#    version: "{{ kolibri_version }}"
+#    extra_args: --no-cache-dir
+#  when: internet_available and kolibri_version is defined
+
 - name: 'Install from templates: kolibri.service unit file for systemd & sites-available/kolibri.conf for Apache'
   template:
     src: "{{ item.src }}"