diff --git a/ansible/roles/base/tasks/main.yaml b/ansible/roles/base/tasks/main.yaml
index 6dfecc3..2312ef2 100644
--- a/ansible/roles/base/tasks/main.yaml
+++ b/ansible/roles/base/tasks/main.yaml
@@ -22,12 +22,4 @@
     apply:
       become: true
       tags:
-        - nomad
-- name: Setup data directory for the nomad host volumes
-  tags: volumes
-  ansible.builtin.include_tasks:
-    file: nomad-host-volumes.yaml
-    apply:
-      become: true
-      tags:
-        - volumes
\ No newline at end of file
+        - nomad
\ No newline at end of file
diff --git a/ansible/roles/base/tasks/nomad-host-volumes.yaml b/ansible/roles/nomad/tasks/main.yaml
similarity index 69%
rename from ansible/roles/base/tasks/nomad-host-volumes.yaml
rename to ansible/roles/nomad/tasks/main.yaml
index b6932c0..f33d50f 100644
--- a/ansible/roles/base/tasks/nomad-host-volumes.yaml
+++ b/ansible/roles/nomad/tasks/main.yaml
@@ -1,8 +1,8 @@
 - name: Ensure the root data directory is present
   ansible.builtin.file:
-    path: "{{ host_vol_root }}"
+    path: "{{ nomad.volumes.root }}"
     state: directory
 - name: Ensure registry volume is present
   ansible.builtin.file:
-    path: "{{ host_vol_root }}/ncr"
+    path: "{{ nomad.volumes.registry }}"
     state: directory
\ No newline at end of file
diff --git a/ansible/roles/nomad/vars/main.yaml b/ansible/roles/nomad/vars/main.yaml
new file mode 100644
index 0000000..af2b1d2
--- /dev/null
+++ b/ansible/roles/nomad/vars/main.yaml
@@ -0,0 +1,4 @@
+nomad:
+  volumes:
+    root: /opt/volumes
+    registry: /opt/volumes/ncr