diff --git a/.github/scripts/.helm-tests/certificates-only/result.yaml b/.github/scripts/.helm-tests/certificates-only/result.yaml
index fe9c67935f..209687369c 100644
--- a/.github/scripts/.helm-tests/certificates-only/result.yaml
+++ b/.github/scripts/.helm-tests/certificates-only/result.yaml
@@ -5,6 +5,8 @@ kind: ServiceAccount
 metadata:
   name: certificate-operator
   namespace: "helmtests"
+  annotations:
+    ciao: commonannotation
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/part-of: keptn
@@ -14,8 +16,6 @@ metadata:
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: cert-manager-0.2.0
     mamma: test
-  annotations:
-    ciao: commonannotation
 ---
 # Source: keptn/charts/certManager/templates/certificate-operator-rbac.yaml
 apiVersion: rbac.authorization.k8s.io/v1
@@ -23,6 +23,8 @@ kind: ClusterRole
 metadata:
   name: certificate-operator-role
   namespace: "helmtests"
+  annotations:
+    ciao: commonannotation
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -76,6 +78,8 @@ kind: ClusterRoleBinding
 metadata:
   name: certificate-operator-rolebinding
   namespace: "helmtests"
+  annotations:
+    ciao: commonannotation
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
@@ -101,6 +105,8 @@ kind: Role
 metadata:
   name: certificate-operator-role
   namespace: "helmtests"
+  annotations:
+    ciao: commonannotation
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -108,8 +114,6 @@ metadata:
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: cert-manager-0.2.0
     mamma: test
-  annotations:
-    ciao: commonannotation
 rules:
 - apiGroups:
   - ""
@@ -136,6 +140,8 @@ kind: RoleBinding
 metadata:
   name: certificate-operator-leader-election-rolebinding
   namespace: "helmtests"
+  annotations:
+    ciao: commonannotation
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
@@ -146,7 +152,6 @@ metadata:
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: cert-manager-0.2.0
     mamma: test
-  annotations:
     ciao: commonannotation
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -163,6 +168,8 @@ kind: RoleBinding
 metadata:
   name: certificate-operator-role-binding
   namespace: "helmtests"
+  annotations:
+    ciao: commonannotation
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
@@ -173,8 +180,6 @@ metadata:
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: cert-manager-0.2.0
     mamma: test
-  annotations:
-    ciao: commonannotation
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -190,6 +195,8 @@ kind: Deployment
 metadata:
   name: certificate-operator
   namespace: "helmtests"
+  annotations:
+    ciao: commonannotation
   labels:
     app.kubernetes.io/component: keptn-cert-manager
     app.kubernetes.io/part-of: keptn
@@ -200,8 +207,6 @@ metadata:
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: cert-manager-0.2.0
     mamma: test
-  annotations:
-    ciao: commonannotation
 spec:
   replicas: 1
   selector:
diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
index d8be05e799..9cb1116197 100644
--- a/.github/scripts/.helm-tests/default/result.yaml
+++ b/.github/scripts/.helm-tests/default/result.yaml
@@ -11730,6 +11730,11 @@ metadata:
   name: lifecycle-webhook-service
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/instance: keptn-test
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lifecycle-operator
+    app.kubernetes.io/version: vmyversion
+    helm.sh/chart: lifecycle-operator-0.1.0
 spec:
   type: ClusterIP
   selector:
diff --git a/.github/scripts/.helm-tests/lifecycle-only/result.yaml b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
index 7b8bd1c527..657436aae0 100644
--- a/.github/scripts/.helm-tests/lifecycle-only/result.yaml
+++ b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
@@ -9357,6 +9357,11 @@ metadata:
   name: lifecycle-webhook-service
   namespace: "helmtests"
   labels:
+    app.kubernetes.io/instance: keptn-test
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lifecycle-operator
+    app.kubernetes.io/version: vmyversion
+    helm.sh/chart: lifecycle-operator-0.1.0
 spec:
   type: ClusterIP
   selector:
diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
index ecbec626bc..d90fdc30dd 100644
--- a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
+++ b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
@@ -5,6 +5,8 @@ kind: ServiceAccount
 metadata:
   name: certificate-operator
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/part-of: keptn
@@ -20,6 +22,8 @@ kind: ServiceAccount
 metadata:
   name: keptn-scheduler
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -39,6 +43,7 @@ metadata:
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: lifecycle-operator-0.1.0
+    test/jj: test
 ---
 # Source: keptn/charts/lifecycleOperator/templates/lifecycle-manager-config.yaml
 apiVersion: v1
@@ -46,6 +51,8 @@ kind: ConfigMap
 metadata:
   name: lifecycle-manager-config
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -72,6 +79,8 @@ kind: ConfigMap
 metadata:
   name: scheduler-config
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -99,6 +108,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -461,6 +471,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -547,6 +558,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -646,6 +658,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -1782,6 +1795,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -1852,6 +1866,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -2381,6 +2396,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -2636,6 +2652,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -2818,6 +2835,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -3385,6 +3403,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -6724,6 +6743,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -7121,6 +7141,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -7911,6 +7932,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
@@ -8536,6 +8558,8 @@ kind: ClusterRole
 metadata:
   name: certificate-operator-role
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -8588,6 +8612,8 @@ kind: ClusterRole
 metadata:
   name: keptn-scheduler
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -8779,6 +8805,8 @@ kind: ClusterRole
 metadata:
   name: lifecycle-operator-role
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9180,6 +9208,8 @@ kind: ClusterRole
 metadata:
   name: keptn-test-lifecycleOperator-server-resources
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9200,6 +9230,8 @@ kind: ClusterRoleBinding
 metadata:
   name: certificate-operator-rolebinding
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
@@ -9224,6 +9256,8 @@ kind: ClusterRoleBinding
 metadata:
   name: keptn-scheduler
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9245,6 +9279,8 @@ kind: ClusterRoleBinding
 metadata:
   name: lifecycle-operator-rolebinding
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9266,6 +9302,8 @@ kind: Role
 metadata:
   name: certificate-operator-role
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9298,6 +9336,8 @@ kind: Role
 metadata:
   name: leader-election-role
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
@@ -9346,6 +9386,8 @@ kind: Role
 metadata:
   name: lifecycle-operator-leader-election-role
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9391,6 +9433,8 @@ kind: RoleBinding
 metadata:
   name: certificate-operator-leader-election-rolebinding
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
@@ -9400,6 +9444,7 @@ metadata:
     app.kubernetes.io/name: cert-manager
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: cert-manager-0.2.0
+    test/jj: test
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -9415,6 +9460,8 @@ kind: RoleBinding
 metadata:
   name: certificate-operator-role-binding
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
@@ -9439,6 +9486,8 @@ kind: RoleBinding
 metadata:
   name: extension-apiserver-authentication-reader
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9460,6 +9509,8 @@ kind: RoleBinding
 metadata:
   name: lifecycle-operator-leader-election-rolebinding
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9481,6 +9532,8 @@ kind: RoleBinding
 metadata:
   name: lifecycle-operator-rolebinding
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9502,6 +9555,8 @@ kind: Service
 metadata:
   name: lifecycle-operator-metrics-service
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     control-plane: lifecycle-operator
     app.kubernetes.io/instance: keptn-test
@@ -9527,7 +9582,14 @@ kind: Service
 metadata:
   name: lifecycle-webhook-service
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
+    app.kubernetes.io/instance: keptn-test
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: lifecycle-operator
+    app.kubernetes.io/version: vmyversion
+    helm.sh/chart: lifecycle-operator-0.1.0
 spec:
   type: ClusterIP
   selector:
@@ -9545,6 +9607,8 @@ kind: Deployment
 metadata:
   name: certificate-operator
   namespace: "helmtests"
+  annotations:
+    test/jj: test
   labels:
     app.kubernetes.io/component: keptn-cert-manager
     app.kubernetes.io/part-of: keptn
@@ -9639,6 +9703,7 @@ metadata:
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: lifecycle-operator-0.1.0
+    test/jj: test
 spec:
   replicas: 1
   selector:
@@ -9760,6 +9825,7 @@ metadata:
     app.kubernetes.io/name: lifecycle-operator
     app.kubernetes.io/version: vmyversion
     helm.sh/chart: lifecycle-operator-0.1.0
+    test/jj: test
 spec:
   replicas: 1
   selector:
@@ -9833,6 +9899,7 @@ metadata:
   name: lifecycle-mutating-webhook-configuration
   annotations:
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/part-of: "keptn"
@@ -9886,6 +9953,7 @@ metadata:
   name: lifecycle-validating-webhook-configuration
   annotations:
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
+    test/jj: test
   labels:
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml
index bd8e0efcc8..29e7429e06 100644
--- a/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml
+++ b/.github/scripts/.helm-tests/lifecycle-with-certs/values.yaml
@@ -18,3 +18,5 @@ metricsOperator:
 global:
   commonLabels:
     app.kubernetes.io/version: vmyversion
+  commonAnnotations:
+    test/jj: test
diff --git a/keptn-cert-manager/chart/Chart.lock b/keptn-cert-manager/chart/Chart.lock
index 055a12c474..6348ea75c5 100644
--- a/keptn-cert-manager/chart/Chart.lock
+++ b/keptn-cert-manager/chart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: https://charts.lifecycle.keptn.sh
-  version: 0.1.0
-digest: sha256:9b7ad5b50defd3d4064864c815ad4097f9c82ebf6304ff2fc7e9783a70b16df3
-generated: "2023-10-31T08:38:45.09886197+01:00"
+  version: 0.1.1
+digest: sha256:e23ec46850d32494b1956923b8cf43dd06187dfe49a7be033778be9938f092d1
+generated: "2024-01-08T11:50:19.146981+01:00"
diff --git a/keptn-cert-manager/chart/Chart.yaml b/keptn-cert-manager/chart/Chart.yaml
index 9d7b8dbbde..a3f09a902c 100644
--- a/keptn-cert-manager/chart/Chart.yaml
+++ b/keptn-cert-manager/chart/Chart.yaml
@@ -41,4 +41,4 @@ appVersion: "v1.2.0" # x-release-please-version
 dependencies:
   - name: common
     repository: "https://charts.lifecycle.keptn.sh"
-    version: 0.1.0
+    version: 0.1.1
diff --git a/keptn-cert-manager/chart/templates/certificate-operator-leader-election-rbac.yaml b/keptn-cert-manager/chart/templates/certificate-operator-leader-election-rbac.yaml
index 219d74bb5e..9dfc9d7aa9 100644
--- a/keptn-cert-manager/chart/templates/certificate-operator-leader-election-rbac.yaml
+++ b/keptn-cert-manager/chart/templates/certificate-operator-leader-election-rbac.yaml
@@ -3,6 +3,10 @@ kind: RoleBinding
 metadata:
   name: certificate-operator-leader-election-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . }}
+  {{- end }}
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
diff --git a/keptn-cert-manager/chart/templates/certificate-operator-rbac.yaml b/keptn-cert-manager/chart/templates/certificate-operator-rbac.yaml
index dec5be0674..d5d99c92c2 100644
--- a/keptn-cert-manager/chart/templates/certificate-operator-rbac.yaml
+++ b/keptn-cert-manager/chart/templates/certificate-operator-rbac.yaml
@@ -3,9 +3,12 @@ kind: Role
 metadata:
   name: certificate-operator-role
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
   {{- include "common.labels.standard" (dict "context" . ) | nindent 4 }}
-  {{- include "common.annotations" ( dict "context" . ) }}
 rules:
 - apiGroups:
   - ""
@@ -31,6 +34,9 @@ kind: ClusterRole
 metadata:
   name: certificate-operator-role
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
   {{- include "common.labels.standard" (dict "context" .) | nindent 4 }}
 rules:
@@ -78,6 +84,9 @@ kind: ClusterRoleBinding
 metadata:
   name: certificate-operator-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
diff --git a/keptn-cert-manager/chart/templates/certificate-operator-role-binding-rbac.yaml b/keptn-cert-manager/chart/templates/certificate-operator-role-binding-rbac.yaml
index 1967876268..4fce32944f 100644
--- a/keptn-cert-manager/chart/templates/certificate-operator-role-binding-rbac.yaml
+++ b/keptn-cert-manager/chart/templates/certificate-operator-role-binding-rbac.yaml
@@ -3,12 +3,15 @@ kind: RoleBinding
 metadata:
   name: certificate-operator-role-binding
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
     app.kubernetes.io/part-of: keptn
     {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-    {{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/keptn-cert-manager/chart/templates/deployment.yaml b/keptn-cert-manager/chart/templates/deployment.yaml
index 711db681ff..0aa2249b62 100644
--- a/keptn-cert-manager/chart/templates/deployment.yaml
+++ b/keptn-cert-manager/chart/templates/deployment.yaml
@@ -4,12 +4,15 @@ kind: Deployment
 metadata:
   name: certificate-operator
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
     app.kubernetes.io/component: keptn-cert-manager
     app.kubernetes.io/part-of: keptn
     control-plane: certificate-operator
     {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-    {{- include "common.annotations" ( dict "context" . ) }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:
diff --git a/keptn-cert-manager/chart/templates/service-account.yaml b/keptn-cert-manager/chart/templates/service-account.yaml
index a7fdbc27be..1bd4001b0c 100644
--- a/keptn-cert-manager/chart/templates/service-account.yaml
+++ b/keptn-cert-manager/chart/templates/service-account.yaml
@@ -3,8 +3,11 @@ kind: ServiceAccount
 metadata:
   name: certificate-operator
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/part-of: keptn
     {{- include "common.labels.standard" ( dict "context" $ ) | nindent 4 }}
-    {{- include "common.annotations" ( dict "context" . ) }}
diff --git a/lifecycle-operator/chart/Chart.lock b/lifecycle-operator/chart/Chart.lock
index 3c06671183..92f61c308d 100644
--- a/lifecycle-operator/chart/Chart.lock
+++ b/lifecycle-operator/chart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: https://charts.lifecycle.keptn.sh
-  version: 0.1.0
-digest: sha256:9b7ad5b50defd3d4064864c815ad4097f9c82ebf6304ff2fc7e9783a70b16df3
-generated: "2023-10-31T08:38:34.194523376+01:00"
+  version: 0.1.1
+digest: sha256:e23ec46850d32494b1956923b8cf43dd06187dfe49a7be033778be9938f092d1
+generated: "2024-01-08T11:50:14.987664+01:00"
diff --git a/lifecycle-operator/chart/Chart.yaml b/lifecycle-operator/chart/Chart.yaml
index 3c57edb332..62f99ae3c1 100644
--- a/lifecycle-operator/chart/Chart.yaml
+++ b/lifecycle-operator/chart/Chart.yaml
@@ -50,4 +50,4 @@ appVersion: "v0.8.3" # x-release-please-version
 dependencies:
   - name: common
     repository: "https://charts.lifecycle.keptn.sh"
-    version: 0.1.0
+    version: 0.1.1
diff --git a/lifecycle-operator/chart/templates/deployment.yaml b/lifecycle-operator/chart/templates/deployment.yaml
index 37dddce774..5ea3a08ad6 100644
--- a/lifecycle-operator/chart/templates/deployment.yaml
+++ b/lifecycle-operator/chart/templates/deployment.yaml
@@ -5,9 +5,12 @@ kind: ServiceAccount
 metadata:
   name: keptn-scheduler
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 {{- end }}
 ---
 apiVersion: v1
diff --git a/lifecycle-operator/chart/templates/extension-apiserver-authentication-reader-rbac.yaml b/lifecycle-operator/chart/templates/extension-apiserver-authentication-reader-rbac.yaml
index e9e1cb11d2..44ee048c5b 100644
--- a/lifecycle-operator/chart/templates/extension-apiserver-authentication-reader-rbac.yaml
+++ b/lifecycle-operator/chart/templates/extension-apiserver-authentication-reader-rbac.yaml
@@ -4,9 +4,12 @@ kind: RoleBinding
 metadata:
   name: extension-apiserver-authentication-reader
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/lifecycle-operator/chart/templates/keptn-scheduler-rbac.yaml b/lifecycle-operator/chart/templates/keptn-scheduler-rbac.yaml
index 364891412e..82e6fb44b9 100644
--- a/lifecycle-operator/chart/templates/keptn-scheduler-rbac.yaml
+++ b/lifecycle-operator/chart/templates/keptn-scheduler-rbac.yaml
@@ -4,9 +4,12 @@ kind: ClusterRole
 metadata:
   name: keptn-scheduler
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 rules:
 - apiGroups:
   - ""
@@ -191,9 +194,11 @@ kind: ClusterRoleBinding
 metadata:
   name: keptn-scheduler
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/lifecycle-operator/chart/templates/keptnapp-crd.yaml b/lifecycle-operator/chart/templates/keptnapp-crd.yaml
index 90dafb2113..eb14f75472 100644
--- a/lifecycle-operator/chart/templates/keptnapp-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnapp-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" (dict "context" .) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   conversion:
     strategy: Webhook
diff --git a/lifecycle-operator/chart/templates/keptnappcontext-crd.yaml b/lifecycle-operator/chart/templates/keptnappcontext-crd.yaml
index bd7c8123ea..4e2589f028 100644
--- a/lifecycle-operator/chart/templates/keptnappcontext-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnappcontext-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: lifecycle.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/keptnappcreationrequest-crd.yaml b/lifecycle-operator/chart/templates/keptnappcreationrequest-crd.yaml
index 77d411b33d..aa602851d6 100644
--- a/lifecycle-operator/chart/templates/keptnappcreationrequest-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnappcreationrequest-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: lifecycle.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/keptnappversion-crd.yaml b/lifecycle-operator/chart/templates/keptnappversion-crd.yaml
index 682fe4c75f..afd15522a4 100644
--- a/lifecycle-operator/chart/templates/keptnappversion-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnappversion-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   conversion:
     strategy: Webhook
diff --git a/lifecycle-operator/chart/templates/keptnconfig-crd.yaml b/lifecycle-operator/chart/templates/keptnconfig-crd.yaml
index d7143ac512..1dc455b41b 100644
--- a/lifecycle-operator/chart/templates/keptnconfig-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnconfig-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: options.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/keptnevaluation-crd.yaml b/lifecycle-operator/chart/templates/keptnevaluation-crd.yaml
index b2c76a47f9..00948573cb 100644
--- a/lifecycle-operator/chart/templates/keptnevaluation-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnevaluation-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: lifecycle.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/keptnevaluationdefinition-crd.yaml b/lifecycle-operator/chart/templates/keptnevaluationdefinition-crd.yaml
index 7a73f68516..e11a4513dc 100644
--- a/lifecycle-operator/chart/templates/keptnevaluationdefinition-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnevaluationdefinition-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: lifecycle.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/keptnevaluationprovider-crd.yaml b/lifecycle-operator/chart/templates/keptnevaluationprovider-crd.yaml
index e42f15df72..b027681af7 100644
--- a/lifecycle-operator/chart/templates/keptnevaluationprovider-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnevaluationprovider-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   conversion:
     strategy: Webhook
diff --git a/lifecycle-operator/chart/templates/keptntask-crd.yaml b/lifecycle-operator/chart/templates/keptntask-crd.yaml
index 58f15b6f19..73b47b693a 100644
--- a/lifecycle-operator/chart/templates/keptntask-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptntask-crd.yaml
@@ -6,12 +6,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: lifecycle.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/keptntaskdefinition-crd.yaml b/lifecycle-operator/chart/templates/keptntaskdefinition-crd.yaml
index 71d892e7ee..1685bb5db4 100644
--- a/lifecycle-operator/chart/templates/keptntaskdefinition-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptntaskdefinition-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: lifecycle.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/keptnworkload-crd.yaml b/lifecycle-operator/chart/templates/keptnworkload-crd.yaml
index a076bb7397..dccb1fea60 100644
--- a/lifecycle-operator/chart/templates/keptnworkload-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnworkload-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: lifecycle.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/keptnworkloadinstance-crd.yaml b/lifecycle-operator/chart/templates/keptnworkloadinstance-crd.yaml
index 40fe0f649d..646aa58776 100644
--- a/lifecycle-operator/chart/templates/keptnworkloadinstance-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnworkloadinstance-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   conversion:
     strategy: Webhook
diff --git a/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml b/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml
index 0e408dcdf4..0f1b9f83cd 100644
--- a/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: lifecycle.keptn.sh
   names:
diff --git a/lifecycle-operator/chart/templates/leader-election-rbac.yaml b/lifecycle-operator/chart/templates/leader-election-rbac.yaml
index 8534296a23..e5e864d162 100644
--- a/lifecycle-operator/chart/templates/leader-election-rbac.yaml
+++ b/lifecycle-operator/chart/templates/leader-election-rbac.yaml
@@ -3,12 +3,15 @@ kind: Role
 metadata:
   name: leader-election-role
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
     app.kubernetes.io/part-of: keptn
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 rules:
 - apiGroups:
   - ""
diff --git a/lifecycle-operator/chart/templates/lifecycle-manager-config.yaml b/lifecycle-operator/chart/templates/lifecycle-manager-config.yaml
index 1b752d55fa..66a7255553 100644
--- a/lifecycle-operator/chart/templates/lifecycle-manager-config.yaml
+++ b/lifecycle-operator/chart/templates/lifecycle-manager-config.yaml
@@ -3,9 +3,12 @@ kind: ConfigMap
 metadata:
   name: lifecycle-manager-config
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 data:
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
diff --git a/lifecycle-operator/chart/templates/lifecycle-mutating-webhook-configuration.yaml b/lifecycle-operator/chart/templates/lifecycle-mutating-webhook-configuration.yaml
index 05fda5560f..62d58c9325 100644
--- a/lifecycle-operator/chart/templates/lifecycle-mutating-webhook-configuration.yaml
+++ b/lifecycle-operator/chart/templates/lifecycle-mutating-webhook-configuration.yaml
@@ -4,11 +4,11 @@ metadata:
   name: lifecycle-mutating-webhook-configuration
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" (dict "context" .) }}
   labels:
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/part-of: "keptn"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 webhooks:
 - admissionReviewVersions:
   - v1
diff --git a/lifecycle-operator/chart/templates/lifecycle-operator-leader-election-rbac.yaml b/lifecycle-operator/chart/templates/lifecycle-operator-leader-election-rbac.yaml
index d71fccbe3d..8527bf5f73 100644
--- a/lifecycle-operator/chart/templates/lifecycle-operator-leader-election-rbac.yaml
+++ b/lifecycle-operator/chart/templates/lifecycle-operator-leader-election-rbac.yaml
@@ -3,9 +3,12 @@ kind: Role
 metadata:
   name: lifecycle-operator-leader-election-role
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 rules:
 - apiGroups:
   - ""
@@ -44,9 +47,11 @@ kind: RoleBinding
 metadata:
   name: lifecycle-operator-leader-election-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/lifecycle-operator/chart/templates/lifecycle-operator-metrics-service.yaml b/lifecycle-operator/chart/templates/lifecycle-operator-metrics-service.yaml
index f3e344920f..62d55783d3 100644
--- a/lifecycle-operator/chart/templates/lifecycle-operator-metrics-service.yaml
+++ b/lifecycle-operator/chart/templates/lifecycle-operator-metrics-service.yaml
@@ -3,10 +3,13 @@ kind: Service
 metadata:
   name: lifecycle-operator-metrics-service
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
     control-plane: lifecycle-operator
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   type: {{ .Values.lifecycleOperatorMetricsService.type }}
   selector:
diff --git a/lifecycle-operator/chart/templates/lifecycle-operator-rbac.yaml b/lifecycle-operator/chart/templates/lifecycle-operator-rbac.yaml
index 0b91b24428..1a99489c74 100644
--- a/lifecycle-operator/chart/templates/lifecycle-operator-rbac.yaml
+++ b/lifecycle-operator/chart/templates/lifecycle-operator-rbac.yaml
@@ -3,9 +3,12 @@ kind: ClusterRole
 metadata:
   name: lifecycle-operator-role
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 rules:
 - apiGroups:
   - apps
@@ -400,9 +403,11 @@ kind: RoleBinding
 metadata:
   name: lifecycle-operator-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -417,9 +422,11 @@ kind: ClusterRoleBinding
 metadata:
   name: lifecycle-operator-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/lifecycle-operator/chart/templates/lifecycle-validating-webhook-configuration.yaml b/lifecycle-operator/chart/templates/lifecycle-validating-webhook-configuration.yaml
index c698d7f30d..7e0962d44d 100644
--- a/lifecycle-operator/chart/templates/lifecycle-validating-webhook-configuration.yaml
+++ b/lifecycle-operator/chart/templates/lifecycle-validating-webhook-configuration.yaml
@@ -4,10 +4,10 @@ metadata:
   name: lifecycle-validating-webhook-configuration
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 webhooks:
 - admissionReviewVersions:
   - v1
diff --git a/lifecycle-operator/chart/templates/lifecycle-webhook-service.yaml b/lifecycle-operator/chart/templates/lifecycle-webhook-service.yaml
index 96398fa41e..80a4757489 100644
--- a/lifecycle-operator/chart/templates/lifecycle-webhook-service.yaml
+++ b/lifecycle-operator/chart/templates/lifecycle-webhook-service.yaml
@@ -3,8 +3,12 @@ kind: Service
 metadata:
   name: lifecycle-webhook-service
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
-{{- include "common.annotations" ( dict "context" . ) }}
+{{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
 spec:
   type: {{ .Values.lifecycleWebhookService.type }}
   selector:
diff --git a/lifecycle-operator/chart/templates/scheduler-config.yaml b/lifecycle-operator/chart/templates/scheduler-config.yaml
index 86b36c600b..24815ff6cb 100644
--- a/lifecycle-operator/chart/templates/scheduler-config.yaml
+++ b/lifecycle-operator/chart/templates/scheduler-config.yaml
@@ -4,9 +4,12 @@ kind: ConfigMap
 metadata:
   name: scheduler-config
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 data:
   scheduler-config.yaml: |
     apiVersion: kubescheduler.config.k8s.io/v1beta3
diff --git a/lifecycle-operator/chart/templates/server-resources-rbac.yaml b/lifecycle-operator/chart/templates/server-resources-rbac.yaml
index f6f4e99376..2645e79e06 100644
--- a/lifecycle-operator/chart/templates/server-resources-rbac.yaml
+++ b/lifecycle-operator/chart/templates/server-resources-rbac.yaml
@@ -3,9 +3,12 @@ kind: ClusterRole
 metadata:
   name: {{ include "common.fullname"  ( dict "context" . )  }}-server-resources
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 rules:
 - apiGroups:
   - custom.metrics.k8s.io
diff --git a/lifecycle-operator/chart/values.yaml b/lifecycle-operator/chart/values.yaml
index 80fa983ccb..311f6886fe 100644
--- a/lifecycle-operator/chart/values.yaml
+++ b/lifecycle-operator/chart/values.yaml
@@ -20,8 +20,6 @@ global:
   ##
   commonAnnotations: { }
 
-
-
 lifecycleOperatorConfig:
   health:
 ## @param    lifecycleOperatorConfig.health.healthProbeBindAddress setup on what address to start the default health handler
diff --git a/metrics-operator/chart/Chart.lock b/metrics-operator/chart/Chart.lock
index 027bc9c4cc..859e21a207 100644
--- a/metrics-operator/chart/Chart.lock
+++ b/metrics-operator/chart/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: https://charts.lifecycle.keptn.sh
-  version: 0.1.0
-digest: sha256:9b7ad5b50defd3d4064864c815ad4097f9c82ebf6304ff2fc7e9783a70b16df3
-generated: "2023-10-31T08:38:40.189239251+01:00"
+  version: 0.1.1
+digest: sha256:e23ec46850d32494b1956923b8cf43dd06187dfe49a7be033778be9938f092d1
+generated: "2024-01-08T11:50:17.289101+01:00"
diff --git a/metrics-operator/chart/Chart.yaml b/metrics-operator/chart/Chart.yaml
index 9296a779c8..f991147d6f 100644
--- a/metrics-operator/chart/Chart.yaml
+++ b/metrics-operator/chart/Chart.yaml
@@ -44,4 +44,4 @@ appVersion: "v0.8.3" # x-release-please-version
 dependencies:
   - name: common
     repository: "https://charts.lifecycle.keptn.sh"
-    version: 0.1.0
+    version: 0.1.1
diff --git a/metrics-operator/chart/templates/analysis-crd.yaml b/metrics-operator/chart/templates/analysis-crd.yaml
index 817f436100..492b134db9 100644
--- a/metrics-operator/chart/templates/analysis-crd.yaml
+++ b/metrics-operator/chart/templates/analysis-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: metrics.keptn.sh
   names:
diff --git a/metrics-operator/chart/templates/analysisdefinition-crd.yaml b/metrics-operator/chart/templates/analysisdefinition-crd.yaml
index c0525d7462..2e75e9eb37 100644
--- a/metrics-operator/chart/templates/analysisdefinition-crd.yaml
+++ b/metrics-operator/chart/templates/analysisdefinition-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: metrics.keptn.sh
   names:
diff --git a/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml b/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml
index d0445d4251..e06ec85b3a 100644
--- a/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml
+++ b/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: metrics.keptn.sh
   names:
diff --git a/metrics-operator/chart/templates/deployment.yaml b/metrics-operator/chart/templates/deployment.yaml
index b93585282a..5a16d36758 100644
--- a/metrics-operator/chart/templates/deployment.yaml
+++ b/metrics-operator/chart/templates/deployment.yaml
@@ -3,13 +3,16 @@ kind: Deployment
 metadata:
   name: metrics-operator
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
     app.kubernetes.io/part-of: keptn
     app.kubernetes.io/component: metrics-operator
     control-plane: metrics-operator
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:
diff --git a/metrics-operator/chart/templates/keptnmetric-crd.yaml b/metrics-operator/chart/templates/keptnmetric-crd.yaml
index 6ae2a6debd..5920c22e7e 100644
--- a/metrics-operator/chart/templates/keptnmetric-crd.yaml
+++ b/metrics-operator/chart/templates/keptnmetric-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+ {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: metrics.keptn.sh
   names:
diff --git a/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml b/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml
index 84b0132a41..0d313f6b7f 100644
--- a/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml
+++ b/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml
@@ -5,12 +5,12 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+  {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: metrics.keptn.sh
   names:
diff --git a/metrics-operator/chart/templates/metrics-manager-config.yaml b/metrics-operator/chart/templates/metrics-manager-config.yaml
index ade4d593e7..cea28a2671 100644
--- a/metrics-operator/chart/templates/metrics-manager-config.yaml
+++ b/metrics-operator/chart/templates/metrics-manager-config.yaml
@@ -3,9 +3,12 @@ kind: ConfigMap
 metadata:
   name: metrics-operator-config
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 data:
   controller_manager_config.yaml: |
     apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
diff --git a/metrics-operator/chart/templates/metrics-operator-hpa-controller-rbac.yaml b/metrics-operator/chart/templates/metrics-operator-hpa-controller-rbac.yaml
index 1b2dae7d6d..b96c406ca6 100644
--- a/metrics-operator/chart/templates/metrics-operator-hpa-controller-rbac.yaml
+++ b/metrics-operator/chart/templates/metrics-operator-hpa-controller-rbac.yaml
@@ -4,9 +4,12 @@ kind: ClusterRoleBinding
 metadata:
   name: metrics-operator-hpa-controller
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/metrics-operator/chart/templates/metrics-operator-leader-election-rbac.yaml b/metrics-operator/chart/templates/metrics-operator-leader-election-rbac.yaml
index c59624a8c8..16d0e25400 100644
--- a/metrics-operator/chart/templates/metrics-operator-leader-election-rbac.yaml
+++ b/metrics-operator/chart/templates/metrics-operator-leader-election-rbac.yaml
@@ -3,9 +3,12 @@ kind: Role
 metadata:
   name: metrics-operator-leader-election-role
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 rules:
 - apiGroups:
   - ""
@@ -44,9 +47,11 @@ kind: RoleBinding
 metadata:
   name: metrics-operator-leader-election-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/metrics-operator/chart/templates/metrics-operator-rbac.yaml b/metrics-operator/chart/templates/metrics-operator-rbac.yaml
index 59a4200c57..2c19791e45 100644
--- a/metrics-operator/chart/templates/metrics-operator-rbac.yaml
+++ b/metrics-operator/chart/templates/metrics-operator-rbac.yaml
@@ -3,9 +3,12 @@ kind: ClusterRole
 metadata:
   name: metrics-operator-role
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 rules:
   - apiGroups:
       - ""
@@ -107,9 +110,11 @@ kind: RoleBinding
 metadata:
   name: metrics-operator-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -124,9 +129,11 @@ kind: ClusterRoleBinding
 metadata:
   name: metrics-operator-rolebinding
   namespace: {{ .Release.Namespace | quote }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/metrics-operator/chart/templates/metrics-operator-server-resources-rbac.yaml b/metrics-operator/chart/templates/metrics-operator-server-resources-rbac.yaml
index 67d2679a11..dafda6421d 100644
--- a/metrics-operator/chart/templates/metrics-operator-server-resources-rbac.yaml
+++ b/metrics-operator/chart/templates/metrics-operator-server-resources-rbac.yaml
@@ -3,9 +3,12 @@ kind: ClusterRole
 metadata:
   name: metrics-operator-server-resources
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 rules:
 - apiGroups:
   - custom.metrics.k8s.io
diff --git a/metrics-operator/chart/templates/metrics-operator-service-account.yaml b/metrics-operator/chart/templates/metrics-operator-service-account.yaml
index c74e2cfe0a..1860b1d7cf 100644
--- a/metrics-operator/chart/templates/metrics-operator-service-account.yaml
+++ b/metrics-operator/chart/templates/metrics-operator-service-account.yaml
@@ -3,6 +3,9 @@ kind: ServiceAccount
 metadata:
   name: metrics-operator
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
diff --git a/metrics-operator/chart/templates/metrics-operator-service.yaml b/metrics-operator/chart/templates/metrics-operator-service.yaml
index 14e8270a84..996763f658 100644
--- a/metrics-operator/chart/templates/metrics-operator-service.yaml
+++ b/metrics-operator/chart/templates/metrics-operator-service.yaml
@@ -3,10 +3,13 @@ kind: Service
 metadata:
   name: metrics-operator-service
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
     control-plane: metrics-operator
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   type: {{ .Values.operatorService.type }}
   selector:
diff --git a/metrics-operator/chart/templates/metrics-validating-webhook-configuration.yaml b/metrics-operator/chart/templates/metrics-validating-webhook-configuration.yaml
index 3705b44963..b402989e34 100644
--- a/metrics-operator/chart/templates/metrics-validating-webhook-configuration.yaml
+++ b/metrics-operator/chart/templates/metrics-validating-webhook-configuration.yaml
@@ -4,10 +4,10 @@ metadata:
   name: metrics-validating-webhook-configuration
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
+    {{- include "common.annotations" ( dict "context" . ) }}
   labels:
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 webhooks:
 - admissionReviewVersions:
   - v1
diff --git a/metrics-operator/chart/templates/metrics-webhook-service.yaml b/metrics-operator/chart/templates/metrics-webhook-service.yaml
index 47ef09f649..1f0451a0e8 100644
--- a/metrics-operator/chart/templates/metrics-webhook-service.yaml
+++ b/metrics-operator/chart/templates/metrics-webhook-service.yaml
@@ -3,9 +3,12 @@ kind: Service
 metadata:
   name: metrics-webhook-service
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   type: {{ .Values.webhookService.type }}
   selector:
diff --git a/metrics-operator/chart/templates/system-auth-delegator-rbac.yaml b/metrics-operator/chart/templates/system-auth-delegator-rbac.yaml
index b49c591bbf..641a56087c 100644
--- a/metrics-operator/chart/templates/system-auth-delegator-rbac.yaml
+++ b/metrics-operator/chart/templates/system-auth-delegator-rbac.yaml
@@ -3,9 +3,12 @@ kind: ClusterRoleBinding
 metadata:
   name: system-auth-delegator
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/metrics-operator/chart/templates/v1beta1.custom.metrics.k8s.io.yaml b/metrics-operator/chart/templates/v1beta1.custom.metrics.k8s.io.yaml
index 1c569b1724..b6f24623d3 100644
--- a/metrics-operator/chart/templates/v1beta1.custom.metrics.k8s.io.yaml
+++ b/metrics-operator/chart/templates/v1beta1.custom.metrics.k8s.io.yaml
@@ -4,9 +4,12 @@ kind: APIService
 metadata:
   name: v1beta1.custom.metrics.k8s.io
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: custom.metrics.k8s.io
   groupPriorityMinimum: 100
diff --git a/metrics-operator/chart/templates/v1beta2.custom.metrics.k8s.io.yaml b/metrics-operator/chart/templates/v1beta2.custom.metrics.k8s.io.yaml
index a1f7729b32..7ffe0e7336 100644
--- a/metrics-operator/chart/templates/v1beta2.custom.metrics.k8s.io.yaml
+++ b/metrics-operator/chart/templates/v1beta2.custom.metrics.k8s.io.yaml
@@ -4,9 +4,12 @@ kind: APIService
 metadata:
   name: v1beta2.custom.metrics.k8s.io
   namespace: {{ .Release.Namespace | quote }}
+  {{- $annotations := include "common.annotations" (dict "context" .) }}
+  {{- with $annotations }}
+  annotations: {{- . -}}
+  {{- end }}
   labels:
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
-{{- include "common.annotations" ( dict "context" . ) }}
 spec:
   group: custom.metrics.k8s.io
   groupPriorityMinimum: 100