diff --git a/charts/fission-all/templates/deployment.yaml b/charts/fission-all/templates/deployment.yaml
index a057ca62..a4890b42 100644
--- a/charts/fission-all/templates/deployment.yaml
+++ b/charts/fission-all/templates/deployment.yaml
@@ -178,22 +178,6 @@ spec:
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
 
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: executor
-  labels:
-    svc: executor
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: 8888
-  selector:
-    svc: executor
-
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/fission-all/templates/svc.yaml b/charts/fission-all/templates/svc.yaml
index 741d0840..8fab2cc2 100644
--- a/charts/fission-all/templates/svc.yaml
+++ b/charts/fission-all/templates/svc.yaml
@@ -77,3 +77,19 @@ spec:
     targetPort: 8000
   selector:
     svc: storagesvc
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: executor
+  labels:
+    svc: executor
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: 8888
+  selector:
+    svc: executor
diff --git a/charts/fission-core/templates/deployment.yaml b/charts/fission-core/templates/deployment.yaml
index 9985d1e5..1dbd4928 100644
--- a/charts/fission-core/templates/deployment.yaml
+++ b/charts/fission-core/templates/deployment.yaml
@@ -178,22 +178,6 @@ spec:
 {{- end }}
 
 
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: executor
-  labels:
-    svc: executor
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: 8888
-  selector:
-    svc: executor
-
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/charts/fission-core/templates/svc.yaml b/charts/fission-core/templates/svc.yaml
index 860374ae..f51b37de 100644
--- a/charts/fission-core/templates/svc.yaml
+++ b/charts/fission-core/templates/svc.yaml
@@ -57,3 +57,19 @@ spec:
     targetPort: 8000
   selector:
     svc: storagesvc
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: executor
+  labels:
+    svc: executor
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: 8888
+  selector:
+    svc: executor