diff --git a/fission-rbac.yaml b/fission-rbac.yaml
index 9d85312897..dc5ebc9fac 100644
--- a/fission-rbac.yaml
+++ b/fission-rbac.yaml
@@ -62,7 +62,7 @@ spec:
         - name: controller
           image: fission/fission-bundle
           command: ["/fission-bundle"]
-          args: ["--controllerPort", "8888", "--filepath", "/filestore"]
+          args: ["--controllerPort", "8888"]
       serviceAccountName: fission-svc
 ---
 apiVersion: extensions/v1beta1
@@ -115,6 +115,9 @@ spec:
         image: fission/fission-bundle
         command: ["/fission-bundle"]
         args: ["--poolmgrPort", "8888"]
+        env:
+        - name: FETCHER_IMAGE
+          value: fission/fetcher:v2
       serviceAccountName: fission-svc
 ---
 apiVersion: extensions/v1beta1
@@ -135,40 +138,3 @@ spec:
         command: ["/fission-bundle"]
         args: ["--kubewatcher"]
       serviceAccountName: fission-svc
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: etcd
-  namespace: fission
-  labels:
-    svc: etcd
-spec:
-  ports:
-  - port: 2379
-    targetPort: 2379
-  selector:
-    svc: etcd
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: etcd
-  namespace: fission
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        svc: etcd
-    spec:
-      containers:
-      - name: etcd
-        image: quay.io/coreos/etcd
-        imagePullPolicy: IfNotPresent
-        env:
-        - name: ETCD_LISTEN_CLIENT_URLS
-          value: http://0.0.0.0:2379
-        - name: ETCD_ADVERTISE_CLIENT_URLS
-          value: http://etcd:2379
-      serviceAccountName: fission-svc
diff --git a/fission.yaml b/fission.yaml
index f0e32b45b7..8424de1dc9 100644
--- a/fission.yaml
+++ b/fission.yaml
@@ -30,7 +30,7 @@ spec:
       - name: controller
         image: fission/fission-bundle
         command: ["/fission-bundle"]
-        args: ["--controllerPort", "8888", "--filepath", "/filestore"]
+        args: ["--controllerPort", "8888"]
 
 ---
 apiVersion: extensions/v1beta1
@@ -84,6 +84,9 @@ spec:
         image: fission/fission-bundle
         command: ["/fission-bundle"]
         args: ["--poolmgrPort", "8888"]
+        env:
+        - name: FETCHER_IMAGE
+          value: fission/fetcher:v2
 
 ---
 apiVersion: extensions/v1beta1
@@ -122,41 +125,3 @@ spec:
         image: fission/fission-bundle
         command: ["/fission-bundle"]
         args: ["--timer"]
-
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: etcd
-  namespace: fission
-  labels:
-    svc: etcd
-spec:
-  ports:
-  - port: 2379
-    targetPort: 2379
-  selector:
-    svc: etcd
-
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: etcd
-  namespace: fission
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        svc: etcd
-    spec:
-      containers:
-      - name: etcd
-        image: quay.io/coreos/etcd
-        imagePullPolicy: IfNotPresent
-        env:
-        - name: ETCD_LISTEN_CLIENT_URLS
-          value: http://0.0.0.0:2379
-        - name: ETCD_ADVERTISE_CLIENT_URLS
-          value: http://etcd:2379