diff --git a/linux/storage/mount.sls b/linux/storage/mount.sls
index 6a75898..2a855ed 100644
--- a/linux/storage/mount.sls
+++ b/linux/storage/mount.sls
@@ -5,7 +5,7 @@
 
 {%- if mount.enabled %}
 
-{%- if not mount.file_system in ['nfs', 'nfs4'] %}
+{%- if not mount.file_system in ['nfs', 'nfs4', 'cifs'] %}
 
 mkfs_{{ mount.device}}:
   cmd.run:
diff --git a/metadata/service/system/container.yml b/metadata/service/system/container.yml
new file mode 100644
index 0000000..ccaa130
--- /dev/null
+++ b/metadata/service/system/container.yml
@@ -0,0 +1,13 @@
+applications:
+- linux
+classes:
+- service.linux.support
+parameters:
+  linux:
+    system:
+      enabled: true
+      cluster: default
+    network:
+      enabled: false
+    storage:
+      enabled: false