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: