diff --git a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl
index 598b32afc9..3fc2dbf6cd 100644
--- a/deploy/kubernetes/fluentd-sumologic.yaml.tmpl
+++ b/deploy/kubernetes/fluentd-sumologic.yaml.tmpl
@@ -205,7 +205,8 @@ data:
           @log_level error
           @include logs.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/logs.containers
             @include buffer.output.conf
           </buffer>
         </store>
@@ -239,7 +240,8 @@ data:
         sumo_client "k8s_1.3.0"
         @include logs.output.conf
         <buffer>
-          @type memory
+          @type file
+          path /fluentd/buffer/logs.default
           @include buffer.output.conf
         </buffer>
       </store>
@@ -271,7 +273,8 @@ data:
           sumo_client "k8s_1.3.0"
           @include logs.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/logs.kubelet
             @include buffer.output.conf
           </buffer>
         </store>
@@ -309,7 +312,8 @@ data:
           sumo_client "k8s_1.3.0"
           @include logs.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/logs.systemd
             @include buffer.output.conf
           </buffer>
         </store>
@@ -364,7 +368,8 @@ data:
         verify_ssl "true"
         proxy_uri ""
         <buffer>
-          @type memory
+          @type file
+          path /fluentd/buffer/events
           @include buffer.output.conf
         </buffer>
       </store>
@@ -483,7 +488,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_APISERVER_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.apiserver
             @include buffer.output.conf
           </buffer>
         </store>
@@ -498,7 +504,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_KUBELET_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.container
             @include buffer.output.conf
           </buffer>
         </store>
@@ -513,7 +520,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_CONTROL_PLANE_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.control_plane
             @include buffer.output.conf
           </buffer>
         </store>
@@ -528,7 +536,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_CONTROLLER_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.controller
             @include buffer.output.conf
           </buffer>
         </store>
@@ -543,7 +552,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_KUBELET_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.kubelet
             @include buffer.output.conf
           </buffer>
         </store>
@@ -558,7 +568,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_NODE_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.node
             @include buffer.output.conf
           </buffer>
         </store>
@@ -573,7 +584,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_SCHEDULER_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.scheduler
             @include buffer.output.conf
           </buffer>
         </store>
@@ -588,7 +600,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_STATE_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.state
             @include buffer.output.conf
           </buffer>
         </store>
@@ -603,7 +616,8 @@ data:
           endpoint "#{ENV['SUMO_ENDPOINT_DEFAULT_METRICS_SOURCE']}"
         @include metrics.output.conf
           <buffer>
-            @type memory
+            @type file
+            path /fluentd/buffer/metrics.default
             @include buffer.output.conf
           </buffer>
         </store>
@@ -854,6 +868,8 @@ spec:
         volumeMounts:
         - name: config-volume
           mountPath: /fluentd/etc/
+        - name: buffer
+          mountPath: "/fluentd/buffer"
         livenessProbe:
           httpGet:
             path: /fluentd.pod.healthcheck?json=%7B%22log%22%3A+%22health+check%22%7D
@@ -873,6 +889,15 @@ spec:
             secretKeyRef:
               name: sumologic
               key: endpoint-events
+  volumeClaimTemplates:
+  - metadata:
+      name: buffer
+    spec:
+      accessModes: [ReadWriteOnce]
+      storageClassName: 
+      resources:
+        requests:
+          storage: 10Gi
 ---
 # Source: sumologic/templates/metrics-statefulset.yaml
 
@@ -954,6 +979,8 @@ spec:
         volumeMounts:
         - name: config-volume
           mountPath: /fluentd/etc/
+        - name: buffer
+          mountPath: "/fluentd/buffer"
         env:
         - name: SUMO_ENDPOINT_APISERVER_METRICS_SOURCE
           valueFrom:
@@ -997,6 +1024,15 @@ spec:
               key: endpoint-metrics-kube-state
         - name: ADDITIONAL_PLUGINS
           value: ""
+  volumeClaimTemplates:
+  - metadata:
+      name: buffer
+    spec:
+      accessModes: [ReadWriteOnce]
+      storageClassName: 
+      resources:
+        requests:
+          storage: 10Gi
 
 ---
 # Source: sumologic/templates/statefulset.yaml
@@ -1079,6 +1115,8 @@ spec:
         volumeMounts:
         - name: config-volume
           mountPath: /fluentd/etc/
+        - name: buffer
+          mountPath: "/fluentd/buffer"
         env:
         - name: SUMO_ENDPOINT_DEFAULT_LOGS_SOURCE
           valueFrom:
@@ -1087,6 +1125,15 @@ spec:
               key: endpoint-logs
         - name: ADDITIONAL_PLUGINS
           value: ""
+  volumeClaimTemplates:
+  - metadata:
+      name: buffer
+    spec:
+      accessModes: [ReadWriteOnce]
+      storageClassName: 
+      resources:
+        requests:
+          storage: 10Gi
 
 ---
 # Source: sumologic/templates/hpa.yaml