diff --git a/.github/scripts/.helm-tests/Openshift/result.yaml b/.github/scripts/.helm-tests/Openshift/result.yaml
index 145b14e5d9..acc98f595f 100644
--- a/.github/scripts/.helm-tests/Openshift/result.yaml
+++ b/.github/scripts/.helm-tests/Openshift/result.yaml
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 ---
 # Source: keptn/charts/lifecycleOperator/templates/lifecycle-manager-config.yaml
@@ -76,7 +76,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 data:
   controller_manager_config.yaml: |
@@ -11366,7 +11366,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -11884,7 +11884,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -12915,7 +12915,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -13124,7 +13124,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -13837,7 +13837,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -14369,7 +14369,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
   - apiGroups:
@@ -14437,7 +14437,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -14504,7 +14504,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14525,7 +14525,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14546,7 +14546,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14689,7 +14689,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -14824,7 +14824,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14845,7 +14845,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14915,7 +14915,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -14946,7 +14946,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -15185,7 +15185,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   replicas: 1
@@ -15233,7 +15233,7 @@ spec:
           value: cluster.local
         - name: CERT_MANAGER_ENABLED
           value: "true"
-        image: ghcr.io/keptn/metrics-operator:v2.0.0
+        image: ghcr.io/keptn/metrics-operator:v2.1.0
         imagePullPolicy: IfNotPresent
         name: metrics-operator
         ports:
@@ -15301,7 +15301,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: custom.metrics.k8s.io
@@ -15323,7 +15323,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: custom.metrics.k8s.io
@@ -15430,7 +15430,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 webhooks:
 - admissionReviewVersions:
diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
index 91e8f83f0a..23d30b0d4c 100644
--- a/.github/scripts/.helm-tests/default/result.yaml
+++ b/.github/scripts/.helm-tests/default/result.yaml
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 ---
 # Source: keptn/charts/lifecycleOperator/templates/lifecycle-manager-config.yaml
@@ -76,7 +76,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 data:
   controller_manager_config.yaml: |
@@ -11366,7 +11366,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -11884,7 +11884,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -12915,7 +12915,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -13124,7 +13124,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -13837,7 +13837,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -14369,7 +14369,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
   - apiGroups:
@@ -14437,7 +14437,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -14504,7 +14504,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14525,7 +14525,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14546,7 +14546,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14689,7 +14689,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -14824,7 +14824,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14845,7 +14845,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -14915,7 +14915,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -14946,7 +14946,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -15189,7 +15189,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   replicas: 1
@@ -15307,7 +15307,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: custom.metrics.k8s.io
@@ -15329,7 +15329,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: custom.metrics.k8s.io
@@ -15436,7 +15436,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 webhooks:
 - admissionReviewVersions:
diff --git a/.github/scripts/.helm-tests/local-global-precedence/result.yaml b/.github/scripts/.helm-tests/local-global-precedence/result.yaml
index f3b3e1d0b7..7a3570c40c 100644
--- a/.github/scripts/.helm-tests/local-global-precedence/result.yaml
+++ b/.github/scripts/.helm-tests/local-global-precedence/result.yaml
@@ -52,7 +52,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -103,7 +103,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -11464,7 +11464,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -11988,7 +11988,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -13025,7 +13025,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -13240,7 +13240,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -13959,7 +13959,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -14515,7 +14515,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -14589,7 +14589,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -14674,7 +14674,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -14701,7 +14701,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -14728,7 +14728,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -14895,7 +14895,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -15063,7 +15063,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -15090,7 +15090,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -15178,7 +15178,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -15215,7 +15215,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -15479,7 +15479,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -15529,7 +15529,7 @@ spec:
           value: cluster.local
         - name: CERT_MANAGER_ENABLED
           value: "true"
-        image: local-registry.io/keptn/metrics-operator:v2.0.0
+        image: local-registry.io/keptn/metrics-operator:v2.1.0
         imagePullPolicy: Never
         name: metrics-operator
         ports:
@@ -15605,7 +15605,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -15633,7 +15633,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
@@ -15761,7 +15761,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     globalLabel1: test1
     globalLabel2: test2
     helm.sh/chart: metrics-operator-0.4.0
diff --git a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml
index 0381eaba98..8d0653d62b 100644
--- a/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml
+++ b/.github/scripts/.helm-tests/metrics-only-with-apiservice-disabled/result.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 ---
 # Source: keptn/charts/metricsOperator/templates/metrics-manager-config.yaml
@@ -22,7 +22,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 data:
   controller_manager_config.yaml: |
@@ -52,7 +52,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -570,7 +570,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -1601,7 +1601,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -1810,7 +1810,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -2523,7 +2523,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -2808,7 +2808,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
   - apiGroups:
@@ -2876,7 +2876,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -2898,7 +2898,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -2919,7 +2919,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -2940,7 +2940,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -2985,7 +2985,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3006,7 +3006,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3028,7 +3028,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -3059,7 +3059,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -3086,7 +3086,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   replicas: 1
@@ -3204,7 +3204,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 webhooks:
 - admissionReviewVersions:
diff --git a/.github/scripts/.helm-tests/metrics-only/result.yaml b/.github/scripts/.helm-tests/metrics-only/result.yaml
index 4a82d9fffd..c061fc5b52 100644
--- a/.github/scripts/.helm-tests/metrics-only/result.yaml
+++ b/.github/scripts/.helm-tests/metrics-only/result.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 ---
 # Source: keptn/charts/metricsOperator/templates/metrics-manager-config.yaml
@@ -22,7 +22,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 data:
   controller_manager_config.yaml: |
@@ -52,7 +52,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -570,7 +570,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -1601,7 +1601,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -1810,7 +1810,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -2523,7 +2523,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -2808,7 +2808,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
   - apiGroups:
@@ -2876,7 +2876,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -2898,7 +2898,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -2919,7 +2919,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -2940,7 +2940,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -2961,7 +2961,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -3006,7 +3006,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3027,7 +3027,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3049,7 +3049,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -3080,7 +3080,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -3107,7 +3107,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   replicas: 1
@@ -3225,7 +3225,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: custom.metrics.k8s.io
@@ -3247,7 +3247,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: custom.metrics.k8s.io
@@ -3269,7 +3269,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 webhooks:
 - admissionReviewVersions:
diff --git a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml
index 03ef0a386c..d760550e35 100644
--- a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml
+++ b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml
@@ -24,7 +24,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 ---
 # Source: keptn/charts/metricsOperator/templates/metrics-manager-config.yaml
@@ -37,7 +37,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 data:
   controller_manager_config.yaml: |
@@ -67,7 +67,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -585,7 +585,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -1616,7 +1616,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -1825,7 +1825,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -2538,7 +2538,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: metrics.keptn.sh
@@ -2866,7 +2866,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
   - apiGroups:
@@ -2934,7 +2934,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -2980,7 +2980,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3001,7 +3001,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3022,7 +3022,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3120,7 +3120,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 rules:
 - apiGroups:
@@ -3213,7 +3213,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3234,7 +3234,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -3256,7 +3256,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -3287,7 +3287,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   type: ClusterIP
@@ -3399,7 +3399,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   replicas: 1
@@ -3517,7 +3517,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: custom.metrics.k8s.io
@@ -3539,7 +3539,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 spec:
   group: custom.metrics.k8s.io
@@ -3561,7 +3561,7 @@ metadata:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: metrics-operator
-    app.kubernetes.io/version: v2.0.0
+    app.kubernetes.io/version: v2.1.0
     helm.sh/chart: metrics-operator-0.4.0
 webhooks:
 - admissionReviewVersions:
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 89a020b547..526676d0a6 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -4,5 +4,5 @@
   "runtimes/python-runtime": "1.0.8",
   "runtimes/deno-runtime": "3.0.1",
   "lifecycle-operator": "2.0.0",
-  "metrics-operator": "2.0.0"
+  "metrics-operator": "2.1.0"
 }
diff --git a/metrics-operator/CHANGELOG.md b/metrics-operator/CHANGELOG.md
index 34385b7065..91970b590b 100644
--- a/metrics-operator/CHANGELOG.md
+++ b/metrics-operator/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [2.1.0](https://github.com/keptn/lifecycle-toolkit/compare/metrics-operator-v2.0.0...metrics-operator-v2.1.0) (2025-03-19)
+
+
+### Features
+
+* adding Elastic as a metrics provider ([#3890](https://github.com/keptn/lifecycle-toolkit/issues/3890)) ([1802600](https://github.com/keptn/lifecycle-toolkit/commit/1802600c7aa73d3a67025a6b3b17df920460f669))
+
+
+### Other
+
+* bump helm chart versions ([#3857](https://github.com/keptn/lifecycle-toolkit/issues/3857)) ([1873178](https://github.com/keptn/lifecycle-toolkit/commit/1873178a28878c0a12ce00e20a8e62d105068fe5))
+
+
+### Dependency Updates
+
+* update all golang.org/x packages (minor) ([#3860](https://github.com/keptn/lifecycle-toolkit/issues/3860)) ([80e5650](https://github.com/keptn/lifecycle-toolkit/commit/80e56500d4ed6a90ecf1e2ca411c4b98b294e24f))
+* update golang.org/x/crypto packages ([#3895](https://github.com/keptn/lifecycle-toolkit/issues/3895)) ([42868b9](https://github.com/keptn/lifecycle-toolkit/commit/42868b923479bbeeda49b87cef614fe41e627509))
+
 ## [2.0.0](https://github.com/keptn/lifecycle-toolkit/compare/metrics-operator-v1.1.1...metrics-operator-v2.0.0) (2024-11-11)
 
 
diff --git a/metrics-operator/Makefile b/metrics-operator/Makefile
index ca0dde67b9..f2c225bc93 100644
--- a/metrics-operator/Makefile
+++ b/metrics-operator/Makefile
@@ -7,7 +7,7 @@ RELEASE_REGISTRY?=ghcr.io/keptn
 RELEASE_TIME=$(shell date +%Y%m%d%s)
 BUILD_TIME=$(shell date -u "+%F_%T")
 RELEASE_VERSION?=$(RELEASE_TIME)-v0.24.3#$(shell git describe --tags --match "v*")
-TAG?="v2.0.0" # x-release-please-version
+TAG?="v2.1.0" # x-release-please-version
 RELEASE_IMAGE:=metrics-operator:$(TAG)
 CHART_APPVERSION?=""
 
diff --git a/metrics-operator/chart/Chart.yaml b/metrics-operator/chart/Chart.yaml
index 143d0af3c6..e0190c7006 100644
--- a/metrics-operator/chart/Chart.yaml
+++ b/metrics-operator/chart/Chart.yaml
@@ -23,7 +23,7 @@ annotations:
 kubeVersion: '>= 1.27.0-0'
 type: application
 version: 0.4.0 # Helm Chart version
-appVersion: v2.0.0 # x-release-please-version
+appVersion: v2.1.0
 dependencies:
   - name: common
     repository: https://charts.lifecycle.keptn.sh
diff --git a/metrics-operator/chart/README.md b/metrics-operator/chart/README.md
index 18052fca68..41b234fd80 100644
--- a/metrics-operator/chart/README.md
+++ b/metrics-operator/chart/README.md
@@ -79,7 +79,7 @@ Prometheus, Dynatrace, DataDog and K8s metric server...
 | `env.analysisControllerLogLevel`                    | sets the log level of Analysis Controller                               | `0`                      |
 | `image.registry`                                    | specify the container registry for the metrics-operator image           | `""`                     |
 | `image.repository`                                  | specify registry for manager image                                      | `keptn/metrics-operator` |
-| `image.tag`                                         | select tag for manager image                                            | `v2.0.0`                 |
+| `image.tag`                                         | select tag for manager image                                            | `v2.1.0`                 |
 | `image.imagePullPolicy`                             | specify pull policy for the manager image. This overrides global values | `""`                     |
 | `livenessProbe`                                     | custom livenessprobe for manager container                              |                          |
 | `readinessProbe`                                    | custom readinessprobe for manager container                             |                          |
diff --git a/metrics-operator/chart/values.yaml b/metrics-operator/chart/values.yaml
index 880aeb0392..d6b8085203 100644
--- a/metrics-operator/chart/values.yaml
+++ b/metrics-operator/chart/values.yaml
@@ -140,7 +140,7 @@ image:
 ## @param   image.repository specify registry for manager image
   repository: keptn/metrics-operator
 ## @param   image.tag select tag for manager image
-  tag: v2.0.0 # x-release-please-version
+  tag: v2.1.0 # x-release-please-version
 ## @param   image.imagePullPolicy specify pull policy for the manager image. This overrides global values
   imagePullPolicy: ""
 ## @extra  livenessProbe custom livenessprobe for manager container
diff --git a/metrics-operator/converter/sli_converter.md b/metrics-operator/converter/sli_converter.md
index 40304addab..870ddc3a72 100644
--- a/metrics-operator/converter/sli_converter.md
+++ b/metrics-operator/converter/sli_converter.md
@@ -13,7 +13,7 @@ To run the converter, execute the following command:
 
 <!---x-release-please-start-version-->
 ```shell
-METRICS_OPERATOR_IMAGE=ghcr.io/keptn/metrics-operator:v2.0.0
+METRICS_OPERATOR_IMAGE=ghcr.io/keptn/metrics-operator:v2.1.0
 PATH_TO_SLI=<PATH_TO_SLI>
 KEPTN_PROVIDER_NAME=<KEPTN_PROVIDER_NAME>
 KEPTN_PROVIDER_NAMESPACE=<KEPTN_PROVIDER_NAMESPACE>
diff --git a/metrics-operator/converter/slo_converter.md b/metrics-operator/converter/slo_converter.md
index e549328459..4877aae705 100644
--- a/metrics-operator/converter/slo_converter.md
+++ b/metrics-operator/converter/slo_converter.md
@@ -35,7 +35,7 @@ To run the converter, execute the following command:
 
 <!---x-release-please-start-version-->
 ```shell
-METRICS_OPERATOR_IMAGE=ghcr.io/keptn/metrics-operator:v2.0.0
+METRICS_OPERATOR_IMAGE=ghcr.io/keptn/metrics-operator:v2.1.0
 PATH_TO_SLO=<PATH_TO_SLO>
 ANALYSIS_VALUE_TEMPLATE_NAMESPACE=<ANALYSIS_VALUE_TEMPLATE_NAMESPACE>
 ANALYSIS_DEFINITION_NAME=<ANALYSIS_DEFINITION_NAME>