diff --git a/charts/fission-all/templates/controller/clusterrole.yaml b/charts/fission-all/templates/controller/clusterrole.yaml
index 6c13a5d6bc..21544d7dd9 100644
--- a/charts/fission-all/templates/controller/clusterrole.yaml
+++ b/charts/fission-all/templates/controller/clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if or (.Values.controller.enabled) (.Values.influxdb.enabled) }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -39,3 +40,4 @@ rules:
   - get
   - list
   - watch
+{{- end -}}
\ No newline at end of file
diff --git a/charts/fission-all/templates/controller/clusterrolebinding.yaml b/charts/fission-all/templates/controller/clusterrolebinding.yaml
index 174312df14..a4ec9b2037 100644
--- a/charts/fission-all/templates/controller/clusterrolebinding.yaml
+++ b/charts/fission-all/templates/controller/clusterrolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if or (.Values.controller.enabled) (.Values.influxdb.enabled) }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -10,3 +11,4 @@ roleRef:
   kind: ClusterRole
   name: {{ .Release.Name }}-controller
   apiGroup: rbac.authorization.k8s.io
+{{- end -}}
\ No newline at end of file
diff --git a/charts/fission-all/templates/controller/deployment.yaml b/charts/fission-all/templates/controller/deployment.yaml
index b3fca557cc..69aee70fbe 100644
--- a/charts/fission-all/templates/controller/deployment.yaml
+++ b/charts/fission-all/templates/controller/deployment.yaml
@@ -1,3 +1,4 @@
+{{- if or (.Values.controller.enabled) (.Values.influxdb.enabled) }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -93,4 +94,5 @@ spec:
     {{- end }}
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/fission-all/templates/controller/role-fission-cr.yaml b/charts/fission-all/templates/controller/role-fission-cr.yaml
index d87dd1a0eb..645b550e21 100644
--- a/charts/fission-all/templates/controller/role-fission-cr.yaml
+++ b/charts/fission-all/templates/controller/role-fission-cr.yaml
@@ -1,3 +1,4 @@
+{{- if or (.Values.controller.enabled) (.Values.influxdb.enabled) }}
 {{- include "fission-role-generator" (merge (dict "namespace" .Values.defaultNamespace "component" "controller") .) }}
 
 {{- if not .Values.singleDefaultNamespace }}
@@ -5,3 +6,4 @@
 {{ include "fission-role-generator" (merge (dict "namespace" $namespace "component" "controller") $) }}
 {{- end }}
 {{- end }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/fission-all/templates/controller/serviceaccount.yaml b/charts/fission-all/templates/controller/serviceaccount.yaml
index ffd71a94a0..235460d08b 100644
--- a/charts/fission-all/templates/controller/serviceaccount.yaml
+++ b/charts/fission-all/templates/controller/serviceaccount.yaml
@@ -1,5 +1,7 @@
+{{- if or (.Values.controller.enabled) (.Values.influxdb.enabled) }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: fission-controller
   namespace: {{ .Release.Namespace }}
+{{- end -}}
\ No newline at end of file
diff --git a/charts/fission-all/templates/controller/servicemonitor.yaml b/charts/fission-all/templates/controller/servicemonitor.yaml
index 19cedd3a6b..5a67426d2c 100644
--- a/charts/fission-all/templates/controller/servicemonitor.yaml
+++ b/charts/fission-all/templates/controller/servicemonitor.yaml
@@ -1,3 +1,4 @@
+{{- if or (.Values.controller.enabled) (.Values.influxdb.enabled) }}
 {{- if .Values.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -19,4 +20,5 @@ spec:
       svc: controller
   endpoints:
   - targetPort: 8080
+{{- end -}}
 {{- end -}}
\ No newline at end of file
diff --git a/charts/fission-all/templates/controller/svc.yaml b/charts/fission-all/templates/controller/svc.yaml
index fd92e57f85..2e6132f458 100644
--- a/charts/fission-all/templates/controller/svc.yaml
+++ b/charts/fission-all/templates/controller/svc.yaml
@@ -1,3 +1,4 @@
+{{- if or (.Values.controller.enabled) (.Values.influxdb.enabled) }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,4 +16,5 @@ spec:
     nodePort: {{ .Values.controllerPort }}
 {{- end }}
   selector:
-    svc: controller
\ No newline at end of file
+    svc: controller
+{{- end -}}
\ No newline at end of file
diff --git a/charts/fission-all/templates/controller/cm.yaml b/charts/fission-all/templates/misc-functions/cm.yaml
similarity index 100%
rename from charts/fission-all/templates/controller/cm.yaml
rename to charts/fission-all/templates/misc-functions/cm.yaml
diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml
index 0064e82030..03a2997cd9 100644
--- a/charts/fission-all/values.yaml
+++ b/charts/fission-all/values.yaml
@@ -338,6 +338,7 @@ buildermgr:
 ## It contains CRUD APIs for functions, triggers, environments, Kubernetes event watches, etc. and proxy APIs to internal 3rd-party services.
 ##
 controller:
+  enabled: false
   ## Pod resources as:
   ##  resources:
   ##    limits:
diff --git a/skaffold.yaml b/skaffold.yaml
index b51fe52591..cb9b6b60bc 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -65,6 +65,7 @@ deploy:
         kubewatcher.securityContext.enabled: true
         webhook.securityContext.enabled: true
         storagesvc.securityContext.enabled: true
+        controller.enabled: false
       wait: true
     flags:
       install: