diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 604d6f8..ae4fdc8 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -12,6 +12,11 @@
     dest: "{{ build.git.dest }}"
   when: build is defined
 
+- name: Create Docker volume
+  docker_volume:
+    name: "{{ volume_name }}"
+  when: volume_name is defined
+
 - name: Build Docker Image
   docker_image:
     name: "{{ image.name }}"
diff --git a/tasks/monitoring.yml b/tasks/monitoring.yml
index 309f953..eff1886 100644
--- a/tasks/monitoring.yml
+++ b/tasks/monitoring.yml
@@ -65,6 +65,7 @@
     name: docker
   vars:
     name: grafana
+    volume_name: "grafana-storage"
     networks:
       - name: "monitoring"
       - name: "homelab"
@@ -73,7 +74,7 @@
       tag: latest
     user: "{{ PUID }}"
     volumes:
-      - "{{ data_dir }}/monitoring/grafana:/var/lib/grafana"
+      - "grafana-storage:/var/lib/grafana"
     env:
       GF_AUTH_ANONYMOUS_ENABLED: "{{ GRAFANA_AUTH_ANONYMOUS_ENABLED }}"
     labels: