diff --git a/linux/storage/mount.sls b/linux/storage/mount.sls
index 038c4ad..f9c04b6 100644
--- a/linux/storage/mount.sls
+++ b/linux/storage/mount.sls
@@ -5,6 +5,8 @@
 
 {%- if mount.enabled %}
 
+{%- if not mount.file_system in ['nfs'] %}
+
 mkfs_{{ mount.device}}:
   cmd.run:
   - name: "mkfs.{{ mount.file_system }} -L {{ name }} {{ mount.device }}"
@@ -12,6 +14,8 @@
   - require_in:
     - mount: {{ mount.path }}
 
+{%- endif %}
+
 {{ mount.path }}:
   mount.mounted:
   - device: {{ mount.device }}
diff --git a/metadata/service/system/init.yml b/metadata/service/system/init.yml
index d239c14..c3692b5 100644
--- a/metadata/service/system/init.yml
+++ b/metadata/service/system/init.yml
@@ -4,6 +4,15 @@
   linux:
     system:
       enabled: true
+      logging:
+        heka:
+          enabled: true
+      metering:
+        collectd:
+          enabled: true
+      monitoring:
+        sensu:
+          enabled: true
       user:
         root:
           enabled: true