diff --git a/abstract-olt/Chart.yaml b/abstract-olt/Chart.yaml
index de21b4d..aa1b481 100644
--- a/abstract-olt/Chart.yaml
+++ b/abstract-olt/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 0.1.1
+version: 0.1.2
 appVersion: latest
diff --git a/abstract-olt/templates/deployment.yaml b/abstract-olt/templates/deployment.yaml
index aedc737..7eda753 100644
--- a/abstract-olt/templates/deployment.yaml
+++ b/abstract-olt/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "abstract-olt.fullname" . }}
diff --git a/device-management/Chart.yaml b/device-management/Chart.yaml
index 0dda41e..b65dc0e 100644
--- a/device-management/Chart.yaml
+++ b/device-management/Chart.yaml
@@ -17,4 +17,4 @@
 description: Redfish device management for SEBA
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 1.0.0-dev1
+version: 1.0.0-dev2
diff --git a/device-management/templates/importer-deployment.yaml b/device-management/templates/importer-deployment.yaml
index 7852f0e..9b3763e 100644
--- a/device-management/templates/importer-deployment.yaml
+++ b/device-management/templates/importer-deployment.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: device-management
@@ -21,6 +21,10 @@
     release: {{ .Release.Name }}
 spec:
   replicas: {{ .Values.device_management_replicas }}
+  selector:
+    matchLabels:
+      name: device-management
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/dhcp-server/Chart.yaml b/dhcp-server/Chart.yaml
index 241f457..2b5e201 100644
--- a/dhcp-server/Chart.yaml
+++ b/dhcp-server/Chart.yaml
@@ -14,5 +14,5 @@
 
 name: dhcp-server
 apiVersion: v1
-version: 1.0.1
+version: 1.0.2
 appVersion: 'latest'
diff --git a/dhcp-server/templates/deployment.yaml b/dhcp-server/templates/deployment.yaml
index 4a63279..7daaeb6 100644
--- a/dhcp-server/templates/deployment.yaml
+++ b/dhcp-server/templates/deployment.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: dhcp-server
@@ -21,6 +21,10 @@
     app: dhcp-server
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: dhcp-server
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/kafka-topic-exporter/Chart.yaml b/kafka-topic-exporter/Chart.yaml
index e643c4f..aae7fd4 100644
--- a/kafka-topic-exporter/Chart.yaml
+++ b/kafka-topic-exporter/Chart.yaml
@@ -18,4 +18,4 @@
 description: Kafka Topic Exporter
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.0.0
+version: 1.0.1
diff --git a/kafka-topic-exporter/templates/exporter-deployment.yaml b/kafka-topic-exporter/templates/exporter-deployment.yaml
index f8dc458..01eac80 100644
--- a/kafka-topic-exporter/templates/exporter-deployment.yaml
+++ b/kafka-topic-exporter/templates/exporter-deployment.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 {{- if .Values.kpi_exporter.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "kpi-exporter.fullname" . }}
@@ -22,6 +22,10 @@
     release: {{ .Release.Name }}
 spec:
   replicas: {{ .Values.kpi_exporter.replicas }}
+  selector:
+    matchLabels:
+      name: {{ template "kpi-exporter.fullname" . }}
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/logging/Chart.yaml b/logging/Chart.yaml
index ae8f4c8..d06c1d9 100644
--- a/logging/Chart.yaml
+++ b/logging/Chart.yaml
@@ -17,4 +17,4 @@
 name: logging
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 1.1.1
+version: 1.1.2
diff --git a/logging/requirements.yaml b/logging/requirements.yaml
index 73fb4ab..0a1f628 100644
--- a/logging/requirements.yaml
+++ b/logging/requirements.yaml
@@ -14,22 +14,18 @@
 # limitations under the License.
 
 dependencies:
-
-- name: elasticsearch
-  version: 1.15.3
-  repository: https://kubernetes-charts.storage.googleapis.com/
-
-- name: kibana
-  condition: kibana.enabled
-  version: 1.1.2
-  repository: https://kubernetes-charts.storage.googleapis.com/
-
-- name: fluentd-elasticsearch
-  condition: fluentd-elasticsearch.enabled
-  version: 1.4.1
-  repository: https://kubernetes-charts.storage.googleapis.com/
-
-- name: logstash
-  condition: logstash.enabled
-  version: 1.4.2
-  repository: https://kubernetes-charts.storage.googleapis.com/
+  - name: elasticsearch
+    repository: https://helm.elastic.co
+    version: 7.10.1
+  - name: kibana
+    repository: https://helm.elastic.co
+    version: 7.10.1
+    condition: kibana.enabled
+  - name: fluentd-elasticsearch
+    repository: https://kiwigrid.github.io
+    version: 9.6.2
+    condition: fluentd-elasticsearch.enabled
+  - name: logstash
+    condition: logstash.enabled
+    version: 1.4.2
+    repository: https://charts.helm.sh/stable
diff --git a/mavenrepo/Chart.yaml b/mavenrepo/Chart.yaml
index e848452..a3da1b9 100644
--- a/mavenrepo/Chart.yaml
+++ b/mavenrepo/Chart.yaml
@@ -16,6 +16,6 @@
 name: mavenrepo
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 1.0.1
+version: 1.0.2
 
 appVersion: 'latest'
diff --git a/mavenrepo/templates/deployment.yaml b/mavenrepo/templates/deployment.yaml
index a222c06..e64a5e0 100644
--- a/mavenrepo/templates/deployment.yaml
+++ b/mavenrepo/templates/deployment.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: Deployment
 metadata:
   name: mavenrepo
@@ -20,6 +20,10 @@
     app: mavenrepo
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: mavenrepo
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/mcord/cni-config/01-cni-service-account.yaml b/mcord/cni-config/01-cni-service-account.yaml
index 762cb77..066e1f0 100644
--- a/mcord/cni-config/01-cni-service-account.yaml
+++ b/mcord/cni-config/01-cni-service-account.yaml
@@ -15,7 +15,7 @@
 
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: pod-networks-operator
 rules:
diff --git a/mcord/mcord-cdn-local-free/Chart.yaml b/mcord/mcord-cdn-local-free/Chart.yaml
index ce12639..b2bd2cb 100644
--- a/mcord/mcord-cdn-local-free/Chart.yaml
+++ b/mcord/mcord-cdn-local-free/Chart.yaml
@@ -17,4 +17,4 @@
 appVersion: "1.0"
 description: A Helm chart for MCORD CDN Services in Local Edge for free (w/o wowza)
 name: mcord-cdn-local-free
-version: 0.1.3
\ No newline at end of file
+version: 0.1.4
diff --git a/mcord/mcord-cdn-local-free/templates/nginx.yaml b/mcord/mcord-cdn-local-free/templates/nginx.yaml
index 49abe46..ea08f03 100644
--- a/mcord/mcord-cdn-local-free/templates/nginx.yaml
+++ b/mcord/mcord-cdn-local-free/templates/nginx.yaml
@@ -35,13 +35,17 @@
     protocol: TCP
 
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: nginx-rtmp
 spec:
   serviceName: nginx-rtmp
   replicas: {{ .Values.nginx.replicas}}
+  selector:
+    matchLabels:
+      name: nginx-rtmp
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/mcord/mcord-cdn-local/Chart.yaml b/mcord/mcord-cdn-local/Chart.yaml
index f5c0cf2..8333090 100644
--- a/mcord/mcord-cdn-local/Chart.yaml
+++ b/mcord/mcord-cdn-local/Chart.yaml
@@ -18,4 +18,4 @@
 appVersion: "1.0"
 description: A Helm chart for MCORD CDN Services in Local Edge
 name: mcord-cdn-local
-version: 0.1.5
+version: 0.1.6
diff --git a/mcord/mcord-cdn-local/templates/nginx.yaml b/mcord/mcord-cdn-local/templates/nginx.yaml
index 82de8b0..9f54bde 100644
--- a/mcord/mcord-cdn-local/templates/nginx.yaml
+++ b/mcord/mcord-cdn-local/templates/nginx.yaml
@@ -29,13 +29,17 @@
     protocol: TCP
 
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: nginx-rtmp
 spec:
   serviceName: nginx-rtmp
   replicas: 1
+  selector:
+    matchLabels:
+      name: nginx-rtmp
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
@@ -104,4 +108,4 @@
           - key: nginx.conf
             path: nginx.conf
       - name: shared-volume
-        emptyDir: {}
\ No newline at end of file
+        emptyDir: {}
diff --git a/mcord/mcord-cdn-remote/Chart.yaml b/mcord/mcord-cdn-remote/Chart.yaml
index 283461b..38561c7 100644
--- a/mcord/mcord-cdn-remote/Chart.yaml
+++ b/mcord/mcord-cdn-remote/Chart.yaml
@@ -18,4 +18,4 @@
 appVersion: "1.0"
 description: A Helm chart for MCORD CDN Services in Remote cloud
 name: mcord-cdn-remote
-version: 0.1.5
+version: 0.1.6
diff --git a/mcord/mcord-cdn-remote/templates/wowza.yaml b/mcord/mcord-cdn-remote/templates/wowza.yaml
index 414cb13..1d9454a 100644
--- a/mcord/mcord-cdn-remote/templates/wowza.yaml
+++ b/mcord/mcord-cdn-remote/templates/wowza.yaml
@@ -37,7 +37,7 @@
       port: {{ .Values.wowza.ports.webui }}
 
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: wowza
@@ -45,6 +45,10 @@
 spec:
   serviceName: wowza
   replicas: 1
+  selector:
+    matchLabels:
+      name: wowza
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/mininet/Chart.yaml b/mininet/Chart.yaml
index 1c39680..344b9a7 100644
--- a/mininet/Chart.yaml
+++ b/mininet/Chart.yaml
@@ -18,4 +18,4 @@
 appVersion: 1.0.0
 description: A Helm chart for Mininet
 name: mininet
-version: 1.1.3
+version: 1.1.4
diff --git a/mininet/templates/deployment.yaml b/mininet/templates/deployment.yaml
index ba653b7..25a0031 100644
--- a/mininet/templates/deployment.yaml
+++ b/mininet/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "mininet.fullname" . }}
diff --git a/nem-monitoring/Chart.yaml b/nem-monitoring/Chart.yaml
index beebaf1..9588785 100644
--- a/nem-monitoring/Chart.yaml
+++ b/nem-monitoring/Chart.yaml
@@ -18,4 +18,4 @@
 description: Time Series Storage and Dashboard for CORD
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.3.21
+version: 1.3.22
diff --git a/nem-monitoring/requirements.yaml b/nem-monitoring/requirements.yaml
index be9439f..e0851e2 100644
--- a/nem-monitoring/requirements.yaml
+++ b/nem-monitoring/requirements.yaml
@@ -16,7 +16,7 @@
 dependencies:
 - name: prometheus
   version: 9.3.1
-  repository: https://kubernetes-charts.storage.googleapis.com/
+  repository: https://charts.helm.sh/stable
 - name: grafana
   version: 4.0.2
-  repository: https://kubernetes-charts.storage.googleapis.com/
+  repository: https://charts.helm.sh/stable
diff --git a/nem-monitoring/templates/exporter-deployment.yaml b/nem-monitoring/templates/exporter-deployment.yaml
index f49029f..cd30156 100644
--- a/nem-monitoring/templates/exporter-deployment.yaml
+++ b/nem-monitoring/templates/exporter-deployment.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 {{- if .Values.kpi_exporter.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "kpi-exporter.fullname" . }}
@@ -22,6 +22,10 @@
     release: {{ .Release.Name }}
 spec:
   replicas: {{ .Values.kpi_exporter.nem_kpi_exporter_replicas }}
+  selector:
+    matchLabels:
+      name: sadis-server
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/oaisim/Chart.yaml b/oaisim/Chart.yaml
index d4591be..0917e4c 100644
--- a/oaisim/Chart.yaml
+++ b/oaisim/Chart.yaml
@@ -16,4 +16,4 @@
 appVersion: "1.0"
 description: openairinterface5g eNB and UE
 name: oaisim
-version: 0.1.5
+version: 0.1.6
diff --git a/oaisim/templates/_helper.tpl b/oaisim/templates/_helper.tpl
index 20c344e..0e62489 100644
--- a/oaisim/templates/_helper.tpl
+++ b/oaisim/templates/_helper.tpl
@@ -76,7 +76,7 @@
   labels:
 {{ tuple $saName $context | include "oaisim.metadata_labels" | indent 4 }}
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ $saName }}
@@ -92,7 +92,7 @@
     name: {{ $saName }}
     namespace: {{ $saNamespace }}
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ $saName }}
diff --git a/onos-progran/Chart.yaml b/onos-progran/Chart.yaml
index 039f2b7..dc96731 100644
--- a/onos-progran/Chart.yaml
+++ b/onos-progran/Chart.yaml
@@ -15,7 +15,7 @@
 
 name: onos-progran
 description: ONOS with progran APP
-version: 1.2.6
+version: 1.2.7
 icon: https://guide.opencord.org/logos/onos.svg
 apiVersion: v1
 appVersion: 0.1.8
diff --git a/onos-progran/templates/onos-progran-deployment.yaml b/onos-progran/templates/onos-progran-deployment.yaml
index 9825d67..74b1117 100644
--- a/onos-progran/templates/onos-progran-deployment.yaml
+++ b/onos-progran/templates/onos-progran-deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "onos.fullname" . }}
diff --git a/onos/Chart.yaml b/onos/Chart.yaml
index aca20fc..26c8742 100644
--- a/onos/Chart.yaml
+++ b/onos/Chart.yaml
@@ -16,6 +16,6 @@
 apiVersion: v1
 name: onos
 description: Open Network Operating System
-version: 3.0.1
+version: 3.0.2
 icon: https://guide.opencord.org/logos/onos.svg
 appVersion: 2.2.1
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index 85cd1ff..dc13f63 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "onos.fullname" . }}
diff --git a/ovsplugin/Chart.yaml b/ovsplugin/Chart.yaml
index faaa5df..455bc69 100644
--- a/ovsplugin/Chart.yaml
+++ b/ovsplugin/Chart.yaml
@@ -16,4 +16,4 @@
 name: ovsplugin
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 1.0.1
+version: 1.0.2
diff --git a/ovsplugin/templates/ovs-cni.yaml b/ovsplugin/templates/ovs-cni.yaml
index 26ed2ba..af6ebe8 100644
--- a/ovsplugin/templates/ovs-cni.yaml
+++ b/ovsplugin/templates/ovs-cni.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ovs-plugin
 rules:
@@ -60,7 +60,7 @@
 
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ovs-plugin
 roleRef:
@@ -138,7 +138,7 @@
 ---
 # Install OVS CNI plugin and conf on each slave node.
 kind: DaemonSet
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: ovs-plugin
   namespace: kube-system
diff --git a/ponnet/Chart.yaml b/ponnet/Chart.yaml
index c04fabe..687e329 100644
--- a/ponnet/Chart.yaml
+++ b/ponnet/Chart.yaml
@@ -16,4 +16,4 @@
 name: ponnet
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 1.2.2
+version: 1.2.3
diff --git a/ponnet/templates/genie-cni-1.8.yaml b/ponnet/templates/genie-cni-1.8.yaml
index 0fbf50a..51df41c 100644
--- a/ponnet/templates/genie-cni-1.8.yaml
+++ b/ponnet/templates/genie-cni-1.8.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: genie-plugin
 rules:
@@ -60,7 +60,7 @@
 
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: genie-policy
 rules:
@@ -79,7 +79,7 @@
 
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: genie-plugin
 roleRef:
@@ -99,7 +99,7 @@
 
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: genie-policy
 roleRef:
@@ -157,7 +157,7 @@
 ---
 # Install CNI-Genie plugin on each slave node.
 kind: DaemonSet
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: genie-plugin
   namespace: kube-system
@@ -223,7 +223,7 @@
 ---
 # Genie network admission controller daemonset configuration
 # Genie network admission controller pods will run only in master nodes
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: genie-network-admission-controller
@@ -270,7 +270,7 @@
 ---
 # Daemonset configuration for geine network policy
 kind: DaemonSet
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: genie-policy-controller
   namespace: kube-system
diff --git a/ponnet/templates/ponnet-cni.yaml b/ponnet/templates/ponnet-cni.yaml
index c72abab..8d8a25f 100644
--- a/ponnet/templates/ponnet-cni.yaml
+++ b/ponnet/templates/ponnet-cni.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ponnet-plugin
 rules:
@@ -60,7 +60,7 @@
 
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ponnet-plugin
 roleRef:
@@ -122,7 +122,7 @@
 ---
 # Install Ponnnet CNI conf on each slave node.
 kind: DaemonSet
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: ponnet-plugin
   namespace: kube-system
diff --git a/ponsimv2/Chart.yaml b/ponsimv2/Chart.yaml
index e1edcac..b964d43 100644
--- a/ponsimv2/Chart.yaml
+++ b/ponsimv2/Chart.yaml
@@ -18,7 +18,7 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.2.2
+version: 1.2.3
 
 # VOLTHA version
 appVersion: 1.7.0
diff --git a/ponsimv2/templates/olt.yaml b/ponsimv2/templates/olt.yaml
index fc0a50d..4c675ab 100644
--- a/ponsimv2/templates/olt.yaml
+++ b/ponsimv2/templates/olt.yaml
@@ -30,7 +30,7 @@
   selector:
     olt: olt{{ $i }}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: olt{{ $i }}
diff --git a/ponsimv2/templates/onu.yaml b/ponsimv2/templates/onu.yaml
index 5bb865f..8e693d5 100644
--- a/ponsimv2/templates/onu.yaml
+++ b/ponsimv2/templates/onu.yaml
@@ -17,7 +17,7 @@
 {{- range $i, $junk := until (.Values.numOlts|int) }}
 {{- range $j, $junk1 := until ($onucount) }}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: onu{{ $i }}-{{ $j }}
diff --git a/ponsimv2/templates/rg.yaml b/ponsimv2/templates/rg.yaml
index 732014a..3fb8fb4 100644
--- a/ponsimv2/templates/rg.yaml
+++ b/ponsimv2/templates/rg.yaml
@@ -17,7 +17,7 @@
 {{- range $i, $junk := until (.Values.numOlts|int) }}
 {{- range $j, $junk1 := until ($rgcount) }}
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: rg{{ $i }}-{{ $j }}
diff --git a/sadis-server/Chart.yaml b/sadis-server/Chart.yaml
index 16a4f46..f347d99 100644
--- a/sadis-server/Chart.yaml
+++ b/sadis-server/Chart.yaml
@@ -15,5 +15,5 @@
 name: sadis-server
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 1.0.5
+version: 1.0.6
 appVersion: 1.1.0
diff --git a/sadis-server/templates/sadis-deployment.yaml b/sadis-server/templates/sadis-deployment.yaml
index e7de3c8..182b1e0 100644
--- a/sadis-server/templates/sadis-deployment.yaml
+++ b/sadis-server/templates/sadis-deployment.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: Deployment
 metadata:
@@ -21,6 +21,10 @@
     app: sadis-server
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: sadis-server
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/storage/local-provisioner/Chart.yaml b/storage/local-provisioner/Chart.yaml
index e641198..b86e7de 100644
--- a/storage/local-provisioner/Chart.yaml
+++ b/storage/local-provisioner/Chart.yaml
@@ -20,7 +20,7 @@
 # Minimal changes have been applied to align it with CORD/SEBA
 
 apiVersion: v1
-version: 2.0.1
+version: 2.0.2
 description: local provisioner chart
 name: local-provisioner
 keywords:
diff --git a/storage/local-provisioner/templates/provisioner.yaml b/storage/local-provisioner/templates/provisioner.yaml
index 1e15e3d..822bd93 100644
--- a/storage/local-provisioner/templates/provisioner.yaml
+++ b/storage/local-provisioner/templates/provisioner.yaml
@@ -46,7 +46,7 @@
        {{- end }}
     {{- end }}
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ .Values.daemonset.name }}
diff --git a/storage/rook-operator/Chart.yaml b/storage/rook-operator/Chart.yaml
index 52ae60d..4cbaddd 100644
--- a/storage/rook-operator/Chart.yaml
+++ b/storage/rook-operator/Chart.yaml
@@ -17,4 +17,4 @@
 name: rook-operator
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 0.1.0-dev2
+version: 0.1.0-dev3
diff --git a/storage/rook-operator/requirements.yaml b/storage/rook-operator/requirements.yaml
index 0e3f32a..9fd4c96 100644
--- a/storage/rook-operator/requirements.yaml
+++ b/storage/rook-operator/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
 - name: rook-ceph
-  version: 1.2.6
+  version: 1.5.4
   repository: https://charts.rook.io/release
diff --git a/tools/kafkacat/Chart.yaml b/tools/kafkacat/Chart.yaml
index 82a9921..4241b94 100644
--- a/tools/kafkacat/Chart.yaml
+++ b/tools/kafkacat/Chart.yaml
@@ -18,7 +18,7 @@
 icon: https://kafka.apache.org/images/logo.png
 apiVersion: v1
 
-version: 1.0.2
+version: 1.0.3
 
 # version of confluentinc/cp-kafkacat container
 appVersion: 4.1.2
diff --git a/tools/kafkacat/templates/deployment.yaml b/tools/kafkacat/templates/deployment.yaml
index de219c9..3587cfc 100644
--- a/tools/kafkacat/templates/deployment.yaml
+++ b/tools/kafkacat/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kafkacat
diff --git a/tools/xossh/Chart.yaml b/tools/xossh/Chart.yaml
index ef84c75..ea014db 100644
--- a/tools/xossh/Chart.yaml
+++ b/tools/xossh/Chart.yaml
@@ -17,7 +17,7 @@
 description: A Helm chart for xossh, the XOS command line shell
 icon: https://guide.opencord.org/logos/xos.svg
 apiVersion: v1
-version: 3.0.3
+version: 3.0.4
 
 # Runs the xosproject/xos-client container
 appVersion: 4.0.1
diff --git a/tools/xossh/templates/deployment.yaml b/tools/xossh/templates/deployment.yaml
index e39375d..dfc6214 100644
--- a/tools/xossh/templates/deployment.yaml
+++ b/tools/xossh/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "xossh.fullname" . }}
diff --git a/ves-agent/Chart.yaml b/ves-agent/Chart.yaml
index ccd8de4..a38a8b6 100644
--- a/ves-agent/Chart.yaml
+++ b/ves-agent/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.1
+version: 1.0.2
 appVersion: 1.0.0
diff --git a/ves-agent/templates/deployment.yaml b/ves-agent/templates/deployment.yaml
index ff9d4a9..258ff86 100644
--- a/ves-agent/templates/deployment.yaml
+++ b/ves-agent/templates/deployment.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "ves-agent.name" . }}
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index d46dfa4..82d12c6 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,5 +17,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.10
+version: 1.0.11
 appVersion: 1.7.0
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
-
-
diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index 0d9ab87..3c371ca 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -18,7 +18,7 @@
 description: XOS - An Extensible Cloud Operating System
 icon: https://guide.opencord.org/logos/xos.svg
 
-version: 4.0.0
+version: 4.0.1
 
 # appVersion is of the xos-core containers.
 # xos-tosca, xos-chameleon, and xos-api-tester are versioned in values.yaml
diff --git a/xos-core/templates/50-rbac.yaml b/xos-core/templates/50-rbac.yaml
index fd4bde0..5e145ec 100644
--- a/xos-core/templates/50-rbac.yaml
+++ b/xos-core/templates/50-rbac.yaml
@@ -18,7 +18,7 @@
 metadata:
   name: kubernetes-synchronizer
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: kubernetes-synchronizer-cluster-admin
diff --git a/xos-core/templates/chameleon-deployment.yaml b/xos-core/templates/chameleon-deployment.yaml
index a715a98..5ae86ec 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.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: xos-chameleon
@@ -21,6 +21,10 @@
     {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-chameleon
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/xos-core/templates/core-deployment.yaml b/xos-core/templates/core-deployment.yaml
index a8625e2..86b6a0f 100644
--- a/xos-core/templates/core-deployment.yaml
+++ b/xos-core/templates/core-deployment.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: xos-core
@@ -21,6 +21,10 @@
     {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-core
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
@@ -79,4 +83,3 @@
             items:
               - key: config
                 path: migrations/initial_data.yaml
-
diff --git a/xos-core/templates/tosca-deployment.yaml b/xos-core/templates/tosca-deployment.yaml
index c6f8376..10a613b 100644
--- a/xos-core/templates/tosca-deployment.yaml
+++ b/xos-core/templates/tosca-deployment.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: xos-tosca
@@ -21,6 +21,10 @@
     {{- include "xos-core.release_labels" . | indent 4 }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-tosca
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/xos-db/Chart.yaml b/xos-db/Chart.yaml
index 945745e..80e330d 100644
--- a/xos-db/Chart.yaml
+++ b/xos-db/Chart.yaml
@@ -15,7 +15,7 @@
 
 name: xos-db
 apiVersion: v1
-version: 1.0.3
+version: 1.0.4
 
 icon: https://www.postgresql.org/media/img/about/press/elephant.png
 
diff --git a/xos-db/templates/db-deployment.yaml b/xos-db/templates/db-deployment.yaml
index 4f0bee6..8fa7056 100644
--- a/xos-db/templates/db-deployment.yaml
+++ b/xos-db/templates/db-deployment.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: xos-db
@@ -21,6 +21,10 @@
     app: xos-db
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-db
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/xos-gui/Chart.yaml b/xos-gui/Chart.yaml
index 2f9a633..90d13aa 100644
--- a/xos-gui/Chart.yaml
+++ b/xos-gui/Chart.yaml
@@ -17,7 +17,7 @@
 description: Web GUI for XOS
 icon: https://guide.opencord.org/logos/xos.svg
 apiVersion: v1
-version: 1.2.8
+version: 1.2.9
 
 # appVersion is of the xos-gui container, xos-ws tag is specified in values.yaml
 appVersion: 1.0.6
diff --git a/xos-gui/templates/gui-deployment.yaml b/xos-gui/templates/gui-deployment.yaml
index d8d8b13..709d16a 100644
--- a/xos-gui/templates/gui-deployment.yaml
+++ b/xos-gui/templates/gui-deployment.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: xos-gui
@@ -21,6 +21,10 @@
     {{- include "xos-gui.release_labels" . | indent 4 }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-gui
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/xos-gui/templates/ws-deployment.yaml b/xos-gui/templates/ws-deployment.yaml
index e10d0f8..f44f3e5 100644
--- a/xos-gui/templates/ws-deployment.yaml
+++ b/xos-gui/templates/ws-deployment.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: xos-ws
@@ -21,6 +21,10 @@
     {{- include "xos-gui.release_labels" . | indent 4 }}
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: xos-ws
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
diff --git a/xos-services/addressmanager/Chart.yaml b/xos-services/addressmanager/Chart.yaml
index 641dd97..1e0bfb0 100644
--- a/xos-services/addressmanager/Chart.yaml
+++ b/xos-services/addressmanager/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 2.0.5
+version: 2.0.6
 appVersion: 2.0.4
diff --git a/xos-services/addressmanager/templates/deployment.yaml b/xos-services/addressmanager/templates/deployment.yaml
index 61f1900..79b1923 100644
--- a/xos-services/addressmanager/templates/deployment.yaml
+++ b/xos-services/addressmanager/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "addressmanager.fullname" . }}
diff --git a/xos-services/att-workflow-driver/Chart.yaml b/xos-services/att-workflow-driver/Chart.yaml
index 70fad37..f9d7c85 100644
--- a/xos-services/att-workflow-driver/Chart.yaml
+++ b/xos-services/att-workflow-driver/Chart.yaml
@@ -18,5 +18,5 @@
 description: A Helm chart for XOS's "att-workflow-driver" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.0
+version: 2.0.1
 appVersion: 2.0.0
diff --git a/xos-services/att-workflow-driver/templates/deployment.yaml b/xos-services/att-workflow-driver/templates/deployment.yaml
index 2b7b439..085a82d 100644
--- a/xos-services/att-workflow-driver/templates/deployment.yaml
+++ b/xos-services/att-workflow-driver/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "att-workflow-driver.fullname" . }}
diff --git a/xos-services/dt-workflow-driver/Chart.yaml b/xos-services/dt-workflow-driver/Chart.yaml
index 1850155..065cbd7 100644
--- a/xos-services/dt-workflow-driver/Chart.yaml
+++ b/xos-services/dt-workflow-driver/Chart.yaml
@@ -19,5 +19,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 2.0.1
+version: 2.0.2
 appVersion: 2.0.1
diff --git a/xos-services/dt-workflow-driver/templates/deployment.yaml b/xos-services/dt-workflow-driver/templates/deployment.yaml
index aa91d37..bdae7bf 100644
--- a/xos-services/dt-workflow-driver/templates/deployment.yaml
+++ b/xos-services/dt-workflow-driver/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "dt-workflow-driver.fullname" . }}
diff --git a/xos-services/epc-service/Chart.yaml b/xos-services/epc-service/Chart.yaml
index 2b5a7f4..b9ffbf6 100644
--- a/xos-services/epc-service/Chart.yaml
+++ b/xos-services/epc-service/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.1.4
+version: 1.1.5
 appVersion: 1.1.3
diff --git a/xos-services/epc-service/templates/deployment.yaml b/xos-services/epc-service/templates/deployment.yaml
index 6b487ba..93612f3 100644
--- a/xos-services/epc-service/templates/deployment.yaml
+++ b/xos-services/epc-service/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "epc-service.fullname" . }}
diff --git a/xos-services/exampleservice/Chart.yaml b/xos-services/exampleservice/Chart.yaml
index 08bd4e5..f729989 100644
--- a/xos-services/exampleservice/Chart.yaml
+++ b/xos-services/exampleservice/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 2.2.5
+version: 2.2.6
 appVersion: 2.2.4
diff --git a/xos-services/exampleservice/templates/deployment.yaml b/xos-services/exampleservice/templates/deployment.yaml
index 8a42d38..3534338 100644
--- a/xos-services/exampleservice/templates/deployment.yaml
+++ b/xos-services/exampleservice/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "exampleservice.fullname" . }}
diff --git a/xos-services/fabric-crossconnect/Chart.yaml b/xos-services/fabric-crossconnect/Chart.yaml
index 80cf294..dcef8b8 100644
--- a/xos-services/fabric-crossconnect/Chart.yaml
+++ b/xos-services/fabric-crossconnect/Chart.yaml
@@ -18,5 +18,5 @@
 description: A Helm chart for XOS's "fabric-crossconnect" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.0
+version: 2.0.1
 appVersion: 2.0.0
diff --git a/xos-services/fabric-crossconnect/templates/deployment.yaml b/xos-services/fabric-crossconnect/templates/deployment.yaml
index 9017f21..420f5e7 100644
--- a/xos-services/fabric-crossconnect/templates/deployment.yaml
+++ b/xos-services/fabric-crossconnect/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fabric-crossconnect.fullname" . }}
diff --git a/xos-services/fabric/Chart.yaml b/xos-services/fabric/Chart.yaml
index 71a4d54..8b86b07 100644
--- a/xos-services/fabric/Chart.yaml
+++ b/xos-services/fabric/Chart.yaml
@@ -18,5 +18,5 @@
 description: A Helm chart for XOS's "fabric" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 3.0.0
+version: 3.0.1
 appVersion: 3.0.0
diff --git a/xos-services/fabric/templates/deployment.yaml b/xos-services/fabric/templates/deployment.yaml
index 6c666b8..e81d0ba 100644
--- a/xos-services/fabric/templates/deployment.yaml
+++ b/xos-services/fabric/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "fabric.fullname" . }}
diff --git a/xos-services/hippie-oss/Chart.yaml b/xos-services/hippie-oss/Chart.yaml
index 336324b..79f12a9 100644
--- a/xos-services/hippie-oss/Chart.yaml
+++ b/xos-services/hippie-oss/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.1.4
+version: 1.1.5
 appVersion: 1.1.3
diff --git a/xos-services/hippie-oss/templates/deployment.yaml b/xos-services/hippie-oss/templates/deployment.yaml
index ed3d534..a47f64a 100644
--- a/xos-services/hippie-oss/templates/deployment.yaml
+++ b/xos-services/hippie-oss/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "hippie-oss.fullname" . }}
diff --git a/xos-services/hssdb/Chart.yaml b/xos-services/hssdb/Chart.yaml
index d0f54b0..41dde08 100644
--- a/xos-services/hssdb/Chart.yaml
+++ b/xos-services/hssdb/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.3
+version: 1.0.4
 appVersion: 1.0.2
diff --git a/xos-services/hssdb/templates/deployment.yaml b/xos-services/hssdb/templates/deployment.yaml
index a71be99..cf96f72 100644
--- a/xos-services/hssdb/templates/deployment.yaml
+++ b/xos-services/hssdb/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "hssdb.fullname" . }}
diff --git a/xos-services/internetemulator/Chart.yaml b/xos-services/internetemulator/Chart.yaml
index d1e8c3c..376a579 100644
--- a/xos-services/internetemulator/Chart.yaml
+++ b/xos-services/internetemulator/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.3
+version: 1.0.4
 appVersion: 1.0.2
diff --git a/xos-services/internetemulator/templates/deployment.yaml b/xos-services/internetemulator/templates/deployment.yaml
index 2e57bbe..2bfdca9 100644
--- a/xos-services/internetemulator/templates/deployment.yaml
+++ b/xos-services/internetemulator/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "internetemulator.fullname" . }}
diff --git a/xos-services/k8sepcservice/Chart.yaml b/xos-services/k8sepcservice/Chart.yaml
index 18d2b23..0a3b4a0 100644
--- a/xos-services/k8sepcservice/Chart.yaml
+++ b/xos-services/k8sepcservice/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.3
+version: 1.0.4
 appVersion: 1.0.2
diff --git a/xos-services/k8sepcservice/templates/deployment.yaml b/xos-services/k8sepcservice/templates/deployment.yaml
index c017457..d642fcc 100644
--- a/xos-services/k8sepcservice/templates/deployment.yaml
+++ b/xos-services/k8sepcservice/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "vepcservice.fullname" . }}
diff --git a/xos-services/kubernetes/Chart.yaml b/xos-services/kubernetes/Chart.yaml
index a1f7eda..3d451eb 100644
--- a/xos-services/kubernetes/Chart.yaml
+++ b/xos-services/kubernetes/Chart.yaml
@@ -18,5 +18,5 @@
 description: A Helm chart for XOS's "kubernetes" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.0
+version: 2.0.1
 appVersion: 2.0.0
diff --git a/xos-services/kubernetes/templates/deployment.yaml b/xos-services/kubernetes/templates/deployment.yaml
index 83763ca..ecdfe4e 100644
--- a/xos-services/kubernetes/templates/deployment.yaml
+++ b/xos-services/kubernetes/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "kubernetes.fullname" . }}
diff --git a/xos-services/onos-service/Chart.yaml b/xos-services/onos-service/Chart.yaml
index d8bf9a0..aa6e7d2 100644
--- a/xos-services/onos-service/Chart.yaml
+++ b/xos-services/onos-service/Chart.yaml
@@ -18,5 +18,5 @@
 name: onos-service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 3.0.0
+version: 3.0.1
 appVersion: 3.0.0
diff --git a/xos-services/onos-service/templates/deployment.yaml b/xos-services/onos-service/templates/deployment.yaml
index 0398ee0..121c28b 100644
--- a/xos-services/onos-service/templates/deployment.yaml
+++ b/xos-services/onos-service/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "onos-service.fullname" . }}
diff --git a/xos-services/openstack/Chart.yaml b/xos-services/openstack/Chart.yaml
index 93e0862..c1cc05f 100644
--- a/xos-services/openstack/Chart.yaml
+++ b/xos-services/openstack/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.1.7
+version: 1.1.8
 appVersion: 1.1.5
diff --git a/xos-services/openstack/templates/deployment.yaml b/xos-services/openstack/templates/deployment.yaml
index 0e94850..444c552 100644
--- a/xos-services/openstack/templates/deployment.yaml
+++ b/xos-services/openstack/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "openstack.fullname" . }}
diff --git a/xos-services/progran/Chart.yaml b/xos-services/progran/Chart.yaml
index bd3b3c5..7a7fdd3 100644
--- a/xos-services/progran/Chart.yaml
+++ b/xos-services/progran/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 2.0.9
+version: 2.0.10
 appVersion: 2.0.5
diff --git a/xos-services/progran/templates/deployment.yaml b/xos-services/progran/templates/deployment.yaml
index e8600cc..c45c1ad 100644
--- a/xos-services/progran/templates/deployment.yaml
+++ b/xos-services/progran/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "progran.fullname" . }}
diff --git a/xos-services/rcord/Chart.yaml b/xos-services/rcord/Chart.yaml
index 2a87c9c..32bf82e 100644
--- a/xos-services/rcord/Chart.yaml
+++ b/xos-services/rcord/Chart.yaml
@@ -18,5 +18,5 @@
 description: A Helm chart for XOS's "rcord" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.0.0
+version: 2.0.1
 appVersion: 2.0.0
diff --git a/xos-services/rcord/templates/deployment.yaml b/xos-services/rcord/templates/deployment.yaml
index 83b7720..7b597ec 100644
--- a/xos-services/rcord/templates/deployment.yaml
+++ b/xos-services/rcord/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "rcord.fullname" . }}
diff --git a/xos-services/sdncontroller/Chart.yaml b/xos-services/sdncontroller/Chart.yaml
index f2f5789..afd99ce 100644
--- a/xos-services/sdncontroller/Chart.yaml
+++ b/xos-services/sdncontroller/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.3
+version: 1.0.4
 appVersion: 1.0.2
diff --git a/xos-services/sdncontroller/templates/deployment.yaml b/xos-services/sdncontroller/templates/deployment.yaml
index 2c886f2..91671fa 100644
--- a/xos-services/sdncontroller/templates/deployment.yaml
+++ b/xos-services/sdncontroller/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "sdncontroller.fullname" . }}
diff --git a/xos-services/simpleexampleservice/Chart.yaml b/xos-services/simpleexampleservice/Chart.yaml
index 636c73f..29ed9ea 100644
--- a/xos-services/simpleexampleservice/Chart.yaml
+++ b/xos-services/simpleexampleservice/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.2.4
+version: 1.2.5
 appVersion: 1.2.3
diff --git a/xos-services/simpleexampleservice/templates/deployment.yaml b/xos-services/simpleexampleservice/templates/deployment.yaml
index 976e54b..2ffc208 100644
--- a/xos-services/simpleexampleservice/templates/deployment.yaml
+++ b/xos-services/simpleexampleservice/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "simpleexampleservice.fullname" . }}
diff --git a/xos-services/tt-workflow-driver/Chart.yaml b/xos-services/tt-workflow-driver/Chart.yaml
index 76ed56c..f5ecb65 100644
--- a/xos-services/tt-workflow-driver/Chart.yaml
+++ b/xos-services/tt-workflow-driver/Chart.yaml
@@ -19,5 +19,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.1
+version: 1.0.2
 appVersion: 1.0.0
diff --git a/xos-services/tt-workflow-driver/templates/deployment.yaml b/xos-services/tt-workflow-driver/templates/deployment.yaml
index 1cdea92..9ff784b 100644
--- a/xos-services/tt-workflow-driver/templates/deployment.yaml
+++ b/xos-services/tt-workflow-driver/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "tt-workflow-driver.fullname" . }}
diff --git a/xos-services/vhss/Chart.yaml b/xos-services/vhss/Chart.yaml
index 742ca1c..f051ab0 100644
--- a/xos-services/vhss/Chart.yaml
+++ b/xos-services/vhss/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.4
+version: 1.0.5
 appVersion: 1.0.3
diff --git a/xos-services/vhss/templates/deployment.yaml b/xos-services/vhss/templates/deployment.yaml
index 81fd874..5f2fac1 100644
--- a/xos-services/vhss/templates/deployment.yaml
+++ b/xos-services/vhss/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "vhss.fullname" . }}
diff --git a/xos-services/vmme/Chart.yaml b/xos-services/vmme/Chart.yaml
index 485bdf8..76cf616 100644
--- a/xos-services/vmme/Chart.yaml
+++ b/xos-services/vmme/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.4
+version: 1.0.5
 appVersion: 1.0.3
diff --git a/xos-services/vmme/templates/deployment.yaml b/xos-services/vmme/templates/deployment.yaml
index e609c52..471cde1 100644
--- a/xos-services/vmme/templates/deployment.yaml
+++ b/xos-services/vmme/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "vmme.fullname" . }}
diff --git a/xos-services/volt/Chart.yaml b/xos-services/volt/Chart.yaml
index d261edd..aee1e22 100644
--- a/xos-services/volt/Chart.yaml
+++ b/xos-services/volt/Chart.yaml
@@ -18,5 +18,5 @@
 description: A Helm chart for XOS's "olt-service" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 3.0.0
+version: 3.0.1
 appVersion: 3.0.0
diff --git a/xos-services/volt/templates/deployment.yaml b/xos-services/volt/templates/deployment.yaml
index dee6e15..ddfe424 100644
--- a/xos-services/volt/templates/deployment.yaml
+++ b/xos-services/volt/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "volt.fullname" . }}
diff --git a/xos-services/vrouter/Chart.yaml b/xos-services/vrouter/Chart.yaml
index 0c0a59c..3348a3b 100644
--- a/xos-services/vrouter/Chart.yaml
+++ b/xos-services/vrouter/Chart.yaml
@@ -18,5 +18,5 @@
 description: A Helm chart for XOS's "vRouter" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 3.0.0
+version: 3.0.1
 appVersion: 3.0.0
diff --git a/xos-services/vrouter/templates/deployment.yaml b/xos-services/vrouter/templates/deployment.yaml
index 9cfcc8d..e7ef06a 100644
--- a/xos-services/vrouter/templates/deployment.yaml
+++ b/xos-services/vrouter/templates/deployment.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "vrouter.fullname" . }}
diff --git a/xos-services/vsg-hw/Chart.yaml b/xos-services/vsg-hw/Chart.yaml
index 9645e15..f6ac190 100644
--- a/xos-services/vsg-hw/Chart.yaml
+++ b/xos-services/vsg-hw/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.1.1
+version: 1.1.2
 appVersion: 1.1.0
diff --git a/xos-services/vsg-hw/templates/deployment.yaml b/xos-services/vsg-hw/templates/deployment.yaml
index 696ba93..8f95a63 100644
--- a/xos-services/vsg-hw/templates/deployment.yaml
+++ b/xos-services/vsg-hw/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "vsg-hw.fullname" . }}
diff --git a/xos-services/vspgwc/Chart.yaml b/xos-services/vspgwc/Chart.yaml
index f489ea4..1b1b919 100644
--- a/xos-services/vspgwc/Chart.yaml
+++ b/xos-services/vspgwc/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.3
+version: 1.0.4
 appVersion: 1.0.2
diff --git a/xos-services/vspgwc/templates/deployment.yaml b/xos-services/vspgwc/templates/deployment.yaml
index 76a517d..e1093b3 100644
--- a/xos-services/vspgwc/templates/deployment.yaml
+++ b/xos-services/vspgwc/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "vspgwc.fullname" . }}
diff --git a/xos-services/vspgwu/Chart.yaml b/xos-services/vspgwu/Chart.yaml
index e3efd28..4d04a7c 100644
--- a/xos-services/vspgwu/Chart.yaml
+++ b/xos-services/vspgwu/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.3
+version: 1.0.4
 appVersion: 1.0.2
diff --git a/xos-services/vspgwu/templates/deployment.yaml b/xos-services/vspgwu/templates/deployment.yaml
index a6d3bdc..e68ae02 100644
--- a/xos-services/vspgwu/templates/deployment.yaml
+++ b/xos-services/vspgwu/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "vspgwu.fullname" . }}
diff --git a/xos-services/vtn-service/Chart.yaml b/xos-services/vtn-service/Chart.yaml
index 82f7db8..9c61682 100644
--- a/xos-services/vtn-service/Chart.yaml
+++ b/xos-services/vtn-service/Chart.yaml
@@ -18,5 +18,5 @@
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
 
-version: 1.0.5
+version: 1.0.6
 appVersion: 1.0.4
diff --git a/xos-services/vtn-service/templates/deployment.yaml b/xos-services/vtn-service/templates/deployment.yaml
index ccecd3a..40f1e9c 100644
--- a/xos-services/vtn-service/templates/deployment.yaml
+++ b/xos-services/vtn-service/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "vtn.fullname" . }}