diff --git a/defaults/main.yml b/defaults/main.yml
index a6a11bb..ab08270 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 unifi_version: 5.6.39
-unifi_openjdk_version: 1.7.0
+unifi_openjdk_version: 1.8.0
 
 unifi_group: ubnt
 unifi_user: ubnt
@@ -11,5 +11,5 @@ unifi_lvm_enabled: False
 # unifi_lvm_vg: vg_unifi
 # unifi_lvm_lv: lv_unifi
 # unifi_lvm_size: 10G
-# unifi_lvm_fstype: ext4
+# unifi_lvm_fstype: xfs
 unifi_base_dir: /opt/unifi
diff --git a/tasks/install.yml b/tasks/install.yml
index 45867ca..5baacc5 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,44 +1,4 @@
 ---
-- name: Set current unifi version
-  set_fact:
-    unifi_current_version: "{{ (ansible_local.unifi | default (dict(version='0.0.0')))['version'] }}"
-
-- debug:
-    msg: Current version is '{{ unifi_current_version }}'
-
-- block:
-  - name: Install requirements
-    package:
-      name: "{{ item }}"
-      state: present
-    with_items:
-      - "java-{{ unifi_openjdk_version }}-openjdk"
-      - unzip
-      - wget
-
-  - name: Create group '{{ unifi_group }}'
-    group:
-      name: "{{ unifi_group }}"
-      state: present
-
-  - name: Create user '{{ unifi_user }}'
-    user:
-      name: "{{ unifi_user }}"
-      group: "{{ unifi_group }}"
-
-  - name: Setup directories
-    file:
-      path: "{{ item }}"
-      state: directory
-      owner: "{{ unifi_user }}"
-      group: "{{ unifi_group }}"
-      recurse: True
-    with_items:
-      - "{{ unifi_base_dir }}"
-      - "{{ unifi_base_dir }}/{{ unifi_version }}"
-      - /etc/ansible/facts.d
-  become: True
-
 - block:
   - name: Download unifi version '{{ unifi_version }}'
     get_url:
diff --git a/tasks/main.yml b/tasks/main.yml
index dec756e..56a4bd1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,4 +1,5 @@
 ---
-- include_tasks: prepare_storage.yml
+- include_tasks: prepare.yml
+- include_tasks: storage.yml
   when: unifi_lvm_enabled
 - include_tasks: install.yml
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
new file mode 100644
index 0000000..c483721
--- /dev/null
+++ b/tasks/prepare.yml
@@ -0,0 +1,40 @@
+---
+- name: Set current unifi version
+  set_fact:
+    unifi_current_version: "{{ (ansible_local.unifi | default (dict(version='0.0.0')))['version'] }}"
+
+- debug:
+    msg: Current version is '{{ unifi_current_version }}'
+
+- block:
+  - name: Install requirements
+    package:
+      name: "{{ item }}"
+      state: present
+    with_items:
+      - "java-{{ unifi_openjdk_version }}-openjdk"
+      - unzip
+      - wget
+
+  - name: Create group '{{ unifi_group }}'
+    group:
+      name: "{{ unifi_group }}"
+      state: present
+
+  - name: Create user '{{ unifi_user }}'
+    user:
+      name: "{{ unifi_user }}"
+      group: "{{ unifi_group }}"
+
+  - name: Setup directories
+    file:
+      path: "{{ item }}"
+      state: directory
+      owner: "{{ unifi_user }}"
+      group: "{{ unifi_group }}"
+      recurse: True
+    with_items:
+      - "{{ unifi_base_dir }}"
+      - "{{ unifi_base_dir }}/{{ unifi_version }}"
+      - /etc/ansible/facts.d
+  become: True
diff --git a/tasks/prepare_storage.yml b/tasks/storage.yml
similarity index 100%
rename from tasks/prepare_storage.yml
rename to tasks/storage.yml