diff --git a/voltha/templates/vcore_for_etcd.yaml b/voltha/templates/vcore_for_etcd.yaml
index c660760..206930c 100644
--- a/voltha/templates/vcore_for_etcd.yaml
+++ b/voltha/templates/vcore_for_etcd.yaml
@@ -35,21 +35,28 @@
   selector:
     app: vcore
 ---
-apiVersion: apps/v1beta1
-kind: Deployment
+apiVersion: apps/v1
+kind: StatefulSet
 metadata:
   name: vcore
   namespace: {{ .Values.global.namespace }}
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
+  serviceName: vcore
   replicas: {{ .Values.replicas.vcore }}
+  updateStrategy:
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: vcore
   template:
     metadata:
       labels:
         app: vcore
       annotations:
-        cni: "weave"
+        cni: "calico"
     spec:
+      terminationGracePeriodSeconds: 0
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       containers:
         - name: voltha