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: