diff --git a/group_vars/frigate.yml b/group_vars/frigate.yml
index 8111625..48bed7f 100644
--- a/group_vars/frigate.yml
+++ b/group_vars/frigate.yml
@@ -2,7 +2,8 @@
 mem_size: 8192
 num_cpus: 2
 datadisks:
-  - {size: 500}
+  - {size: 50, type: nvme}
+  - {size: 500, type: hdd}
 
 network_vip_interfaces:
   - device: eth1
diff --git a/playbooks/frigate.yml b/playbooks/frigate.yml
index 2b37b1c..83bc482 100644
--- a/playbooks/frigate.yml
+++ b/playbooks/frigate.yml
@@ -13,15 +13,18 @@
     - "{{ ansible_private }}/vars.yml"
 
   pre_tasks:
-    - name: Mount /export
+    - name: Mount datadirectories
       ansible.posix.mount:
-        name: /export
-        src: LABEL=/export
+        name: "/export/frigate/{{ item }}"
+        src: "LABEL={{ item }}"
         fstype: xfs
         opts: noatime,noexec,nosuid,nodev
         passno: "0"
         dump: "0"
         state: mounted
+      with_items:
+        - config
+        - media
 
   roles:
     - base
@@ -32,13 +35,13 @@
       keytab_group: apache
 
   tasks:
-    - name: Run handlers to get interfaces configured
-      ansible.builtin.meta: flush_handlers
-
     - name: Include unbound role
       ansible.builtin.import_role:
         name: unbound
 
+    - name: Run handlers to get interfaces configured
+      ansible.builtin.meta: flush_handlers
+
     - name: Include dhcpd role
       ansible.builtin.include_role:
         name: dhcpd
diff --git a/roles/frigate/tasks/main.yml b/roles/frigate/tasks/main.yml
index 1a8d430..a52e7d2 100644
--- a/roles/frigate/tasks/main.yml
+++ b/roles/frigate/tasks/main.yml
@@ -48,6 +48,15 @@
     setype: container_file_t
   when: ansible_selinux_python_present
 
+- name: Create base directory
+  ansible.builtin.file:
+    path: /export/frigate
+    state: directory
+    mode: "0755"
+    owner: root
+    group: root
+    setype: _default
+
 - name: Create data directories
   ansible.builtin.file:
     path: "{{ item }}"
@@ -57,7 +66,6 @@
     group: frigate
     setype: _default
   with_items:
-    - /export/frigate
     - /export/frigate/config
     - /export/frigate/media