diff --git a/roles/baikal/tasks/main.yml b/roles/baikal/tasks/main.yml
index 00ab0b8..9e34130 100644
--- a/roles/baikal/tasks/main.yml
+++ b/roles/baikal/tasks/main.yml
@@ -1,15 +1,15 @@
 ---
-- name: Ensure data directory is present
+- name: Ensure data subvolume is present
+  community.general.btrfs_subvolume:
+    name: '/baikal'
+
+- name: Ensure data directories are present
   ansible.builtin.file:
-    path: '/mnt/data1/baikal'
+    path: '/mnt/data1/baikal/{{ item }}'
     state: directory
     mode: '0755'
     owner: 'root'
     group: 'root'
-
-- name: Ensure data subvolumes are present
-  community.general.btrfs_subvolume:
-    name: '/baikal/{{ item }}'
   loop:
     - 'Specific'
     - 'config'