diff --git a/linux/storage/mount.sls b/linux/storage/mount.sls
index e50b7a9..f9fc89b 100644
--- a/linux/storage/mount.sls
+++ b/linux/storage/mount.sls
@@ -14,9 +14,12 @@
   - require_in:
     - mount: {{ mount.path }}
   {%- if mount.file_system == 'xfs' %}
-  {%- set install_xfs = True %}
   - require:
-    - pkg: xfs_packages
+    - pkg: xfs_packages_{{ mount.device }}
+
+xfs_packages_{{ mount.device }}:
+  pkg.installed:
+    - name: xfsprogs
   {%- endif %}
 
 {%- endif %}
@@ -29,7 +32,7 @@
   - opts: {{ mount.get('opts', 'defaults,noatime') }}
   {%- if mount.file_system == 'xfs' %}
   - require:
-    - pkg: xfs_packages
+    - pkg: xfs_packages_{{ mount.device }}
   {%- endif %}
 
 {%- if mount.user is defined %}
@@ -53,4 +56,4 @@
     - name: xfsprogs
 {%- endif %}
 
-{%- endif %}
+{%- endif %}
\ No newline at end of file