diff --git a/voltha/templates/10-default-backend.yaml b/voltha/templates/10-default-backend.yaml
index 6ada98f..7ee1ddd 100644
--- a/voltha/templates/10-default-backend.yaml
+++ b/voltha/templates/10-default-backend.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: default-http-backend
@@ -22,6 +22,10 @@
   namespace: {{ .Values.global.namespace }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: default-http-backend
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/voltha/templates/50-rbac.yaml b/voltha/templates/50-rbac.yaml
index 66b6c71..9c5e524 100644
--- a/voltha/templates/50-rbac.yaml
+++ b/voltha/templates/50-rbac.yaml
@@ -20,7 +20,7 @@
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: nginx-ingress-clusterrole
@@ -74,7 +74,7 @@
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: nginx-ingress-role
@@ -117,7 +117,7 @@
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: nginx-ingress-role-nisa-binding
@@ -133,7 +133,7 @@
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: nginx-ingress-clusterrole-nisa-binding
diff --git a/voltha/templates/55-rbac.yaml b/voltha/templates/55-rbac.yaml
index 16ee8b3..c095c34 100644
--- a/voltha/templates/55-rbac.yaml
+++ b/voltha/templates/55-rbac.yaml
@@ -20,7 +20,7 @@
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: voltha-clusterrole
@@ -38,7 +38,7 @@
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: voltha-role
@@ -81,7 +81,7 @@
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: voltha-role-nisa-binding
@@ -97,7 +97,7 @@
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: voltha-clusterrole-nisa-binding
diff --git a/voltha/templates/60-cluster-ingress-nginx.yaml b/voltha/templates/60-cluster-ingress-nginx.yaml
index 98517ee..7e938cb 100644
--- a/voltha/templates/60-cluster-ingress-nginx.yaml
+++ b/voltha/templates/60-cluster-ingress-nginx.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-ingress-controller
diff --git a/voltha/templates/80-ingress.yaml b/voltha/templates/80-ingress.yaml
index 8f28775..d2b2957 100644
--- a/voltha/templates/80-ingress.yaml
+++ b/voltha/templates/80-ingress.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Ingress
 metadata:
   name: voltha-ingress
diff --git a/voltha/templates/alarm-generator.yaml b/voltha/templates/alarm-generator.yaml
index f5ef095..5f245f6 100644
--- a/voltha/templates/alarm-generator.yaml
+++ b/voltha/templates/alarm-generator.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 {{- if .Values.alarm_generator_enable }}
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: alarm-generator
diff --git a/voltha/templates/envoy_for_etcd.yaml b/voltha/templates/envoy_for_etcd.yaml
index 5966076..52107ce 100644
--- a/voltha/templates/envoy_for_etcd.yaml
+++ b/voltha/templates/envoy_for_etcd.yaml
@@ -27,13 +27,17 @@
   selector:
     app: voltha
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: voltha
   namespace: {{ .Values.global.namespace }}
 spec:
   replicas: {{ .Values.replicas.envoy_for_etcd }}
+  selector:
+    matchLabels:
+      name: voltha
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
@@ -69,5 +73,3 @@
               name: mystery2-port
             - containerPort: 50555
               name: grpc-port
-
-
diff --git a/voltha/templates/freeradius.yaml b/voltha/templates/freeradius.yaml
index ef86b16..4c58cf5 100644
--- a/voltha/templates/freeradius.yaml
+++ b/voltha/templates/freeradius.yaml
@@ -39,7 +39,7 @@
   selector:
     app: freeradius
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: freeradius
@@ -47,6 +47,10 @@
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: freeradius
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/voltha/templates/netconf.yaml b/voltha/templates/netconf.yaml
index 7aa571b..e3aff6a 100644
--- a/voltha/templates/netconf.yaml
+++ b/voltha/templates/netconf.yaml
@@ -27,7 +27,7 @@
     - port: 830
       targetPort: 830
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: netconf
@@ -35,6 +35,10 @@
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
   replicas: {{ .Values.replicas.netconf }}
+  selector:
+    matchLabels:
+      name: netconf
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/voltha/templates/ofagent.yaml b/voltha/templates/ofagent.yaml
index c70f408..2185ddf 100644
--- a/voltha/templates/ofagent.yaml
+++ b/voltha/templates/ofagent.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ofagent
@@ -21,6 +21,10 @@
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
   replicas: {{ .Values.replicas.ofagent }}
+  selector:
+    matchLabels:
+      name: ofagent
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/voltha/templates/vcli.yaml b/voltha/templates/vcli.yaml
index 2077705..9bbdf63 100644
--- a/voltha/templates/vcli.yaml
+++ b/voltha/templates/vcli.yaml
@@ -31,7 +31,7 @@
   selector:
     app: vcli
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: vcli
@@ -39,6 +39,10 @@
   serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
 spec:
   replicas: {{ .Values.replicas.vcli }}
+  selector:
+    matchLabels:
+      name: device-management
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
@@ -65,5 +69,3 @@
           ports:
             - containerPort: 22
               name: ssh-port
-
-