diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index e7c87f2..a8c2f05 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -39,6 +39,7 @@
 - "--backend=etcd"
 - "--pon-subnet=10.38.0.0/12"
 - "--ponsim-comm=grpc"
+- "--core-number-extractor=^.*-([0-9]+)_.*$"
 {{- end }}
 
 
diff --git a/voltha/templates/netconf.yaml b/voltha/templates/netconf.yaml
index acec48f..8ea1638 100644
--- a/voltha/templates/netconf.yaml
+++ b/voltha/templates/netconf.yaml
@@ -38,19 +38,11 @@
     metadata:
       labels:
         app: netconf
+      annotations:
+        cni: "calico"
     spec:
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       terminationGracePeriodSeconds: 10
-      affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
-                matchExpressions:
-                  - key: app
-                    operator: In
-                    values:
-                      - netconf
-              topologyKey: kubernetes.io/hostname
       containers:
       - name: netconf
         image: {{ .Values.netconfImage }}
diff --git a/voltha/templates/ofagent.yaml b/voltha/templates/ofagent.yaml
index 9a2f836..263223d 100644
--- a/voltha/templates/ofagent.yaml
+++ b/voltha/templates/ofagent.yaml
@@ -25,20 +25,10 @@
       labels:
         app: ofagent
       annotations:
-        cni: "weave"
+        cni: "calico"
     spec:
       serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
       terminationGracePeriodSeconds: 10
-      affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
-                operator: In
-                values:
-                - ofagent
-            topologyKey: kubernetes.io/hostname
       containers:
       - name: ofagent
         image: {{ .Values.ofagentImage }}
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
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 32616d1..9f53306 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -43,6 +43,7 @@
         - name: mystery2
           port: 8443
           targetPort: 8443
+          nodePort: 32443
         - name: grpc
           port: 50555
           targetPort: 50555