diff --git a/charts/fission-all/templates/deployment.yaml b/charts/fission-all/templates/deployment.yaml
index 4c77eb38..19d6a7c2 100644
--- a/charts/fission-all/templates/deployment.yaml
+++ b/charts/fission-all/templates/deployment.yaml
@@ -343,7 +343,7 @@ spec:
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
-
+{{- if .Values.influxdb.enabled }}
 ---
 apiVersion: v1
 kind: Service
@@ -380,7 +380,7 @@ spec:
     spec:
       containers:
       - name: influxdb
-        image: influxdb:1.7
+        image: {{ .Values.influxdb.image | quote }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         env:
         - name: INFLUXDB_DB
@@ -398,7 +398,7 @@ spec:
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
-
+{{- end }}
 {{- if .Values.heapster }}
 ---
 apiVersion: v1
diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml
index 08f2e8d4..9ab844d2 100644
--- a/charts/fission-all/values.yaml
+++ b/charts/fission-all/values.yaml
@@ -269,6 +269,11 @@ analyticsNonHelmInstall: false
 ## Enable Heapster only in clusters where heapster does not exist already
 heapster: false
 
+## Enable InfluxDB
+influxdb: 
+  enabled: true
+  image: influxdb:1.7
+
 # Allow user to override busybox image used in fluent-bit init container
 busyboxImage: busybox