diff --git a/charts/fission-all/Chart.yaml b/charts/fission-all/Chart.yaml
index a158f9a7a6..810fdc7488 100644
--- a/charts/fission-all/Chart.yaml
+++ b/charts/fission-all/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: fission-all
-version: 1.8.1-pre4
+version: 1.8.1-pre5
 description: Fission is a fast serverless framework for Kubernetes.
 keywords:
 - fission
diff --git a/charts/fission-all/templates/fluentbit.yaml b/charts/fission-all/templates/fluentbit.yaml
index cb8274c653..18a42c9c1e 100644
--- a/charts/fission-all/templates/fluentbit.yaml
+++ b/charts/fission-all/templates/fluentbit.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.fluentbit }}
 # Fluentbit deployment for Fission
 #
 # Requires:
@@ -190,3 +191,4 @@ spec:
             name: {{ .Release.Name }}-fission-fluentbit
   updateStrategy:
     type: RollingUpdate
+{{- end }}
\ No newline at end of file
diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml
index 003021adc0..30b3c5317d 100644
--- a/charts/fission-all/values.yaml
+++ b/charts/fission-all/values.yaml
@@ -267,6 +267,9 @@ heapster: false
 ## Enable InfluxDB
 influxdb: true
 
+## Enable fluentbit
+fluentbit: true
+
 ## Archive pruner is a garbage collector for archives on the fission storage service.
 ## This interval configures the frequency at which it runs inside the storagesvc pod.
 ## The value is in minutes.