diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 7219b6a..24152ee 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.4.14"
+version: "2.4.15"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 08ce50c..a5b3878 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 {{- $log_level := tpl .Values.rw_core.log_level . | upper }}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ template "fullname" . }}-rw-core"
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 0f65439..6149b9c 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 {{- $log_level := tpl .Values.ofagent.log_level . | upper }}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ template "fullname" . }}-ofagent"
@@ -33,6 +33,10 @@
   {{- end }}
 spec:
   replicas: {{ .Values.replicas.ofagent }}
+  selector:
+    matchLabels:
+      app: ofagent
+      release: {{ .Release.Name }}
   template:
     metadata:
       namespace: {{ .Release.Namespace }}