diff --git a/stable/kommander/Chart.yaml b/stable/kommander/Chart.yaml
index 39ec138e2..5d16b685b 100644
--- a/stable/kommander/Chart.yaml
+++ b/stable/kommander/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
 - name: alejandroEsc
 - name: jimmidyson
 name: kommander
-version: 0.2.27
+version: 0.2.28
diff --git a/stable/kommander/templates/folder.yaml b/stable/kommander/templates/folder.yaml
new file mode 100644
index 000000000..137c5f19a
--- /dev/null
+++ b/stable/kommander/templates/folder.yaml
@@ -0,0 +1,8 @@
+{{- if .Values.folders.enabled -}}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.folders.default.namespace }}
+  {{- with .Values.folders.default.annotations }}
+  {{- with .Values.folders.default.labels }}
+{{- end -}}
diff --git a/stable/kommander/values.yaml b/stable/kommander/values.yaml
index 6fe8b8274..0b4a66ace 100644
--- a/stable/kommander/values.yaml
+++ b/stable/kommander/values.yaml
@@ -170,6 +170,16 @@ grafana:
     #   hosts:
     #   - grafana.example.com
 
+  folders: 
+    enabled: true
+    default: 
+      namespace: kommander-default-folder
+      labels:
+        kommanderType: folder
+      annotations:
+        kommander.d2iq.io/description: Default folder
+        kommander.d2iq.io/display-name: Default
+
   ## Configure grafana datasources
   ## ref: http://docs.grafana.org/administration/provisioning/#datasources
   ##