diff --git a/datavol.yml b/datavol.yml
index 6c0bf09..897d177 100644
--- a/datavol.yml
+++ b/datavol.yml
@@ -29,6 +29,21 @@
     tags:
     - mkfs
 
+  - name: ensure btrfs subvolumes exist
+    community.general.btrfs_subvolume:
+      name: '{{ item.name }}'
+      filesystem_device: '{{ item.device }}'
+      automount: true
+    loop: '{{ btrfs_subvolumes|d([]) }}'
+    tags:
+    - btrfs
+
+  - name: ensure mount point exists
+    file:
+      path: '{{ item.mountpoint }}'
+      state: directory
+    loop: '{{ data_volumes|d([]) }}'
+
   - name: ensure data volume is mounted
     mount:
       path: '{{ item.mountpoint }}'