From 9ee45834bfa4dcedcbe99362d5d58b9febe3caae Mon Sep 17 00:00:00 2001
From: odubajDT <93584209+odubajDT@users.noreply.github.com>
Date: Mon, 27 Nov 2023 08:49:01 +0100
Subject: [PATCH] chore: adapt helm charts to the new Keptn naming (#2564)

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
---
 .../.helm-tests/certificates-only/result.yaml | 10 ++--
 .../scripts/.helm-tests/default/result.yaml   | 52 +++++++++----------
 .../.helm-tests/lifecycle-only/result.yaml    | 30 +++++------
 .../lifecycle-with-certs/result.yaml          | 40 +++++++-------
 .../.helm-tests/metrics-only/result.yaml      | 12 ++---
 .../metrics-with-certs/result.yaml            | 22 ++++----
 chart/Chart.lock                              |  4 +-
 .../contribute/software/dev-environ/_index.md |  2 +-
 .../components/certificate-operator/_index.md |  4 +-
 .../installation/configuration/namespace.md   |  2 +-
 examples/Makefile                             |  4 +-
 examples/sample-app/README.md                 |  2 +-
 examples/support/argo/README.md               |  2 +-
 examples/support/observability/README.md      |  2 +-
 ...ificate-operator-leader-election-rbac.yaml |  2 +-
 .../templates/certificate-operator-rbac.yaml  |  2 +-
 ...ertificate-operator-role-binding-rbac.yaml |  2 +-
 .../chart/templates/deployment.yaml           |  2 +-
 .../chart/templates/service-account.yaml      |  2 +-
 .../config/manager/manager.yaml               |  2 +-
 .../config/rbac/extra_role_binding.yaml       |  2 +-
 .../config/rbac/leader_election_role.yaml     |  2 +-
 .../rbac/leader_election_role_binding.yaml    |  2 +-
 .../config/rbac/role_binding.yaml             |  2 +-
 .../config/rbac/service_account.yaml          |  2 +-
 lifecycle-operator/PROJECT                    |  2 +-
 .../chart/templates/deployment.yaml           |  2 +-
 .../chart/templates/keptnapp-crd.yaml         |  2 +-
 .../keptnappcreationrequest-crd.yaml          |  2 +-
 .../chart/templates/keptnappversion-crd.yaml  |  2 +-
 .../chart/templates/keptnconfig-crd.yaml      |  2 +-
 .../chart/templates/keptnevaluation-crd.yaml  |  2 +-
 .../keptnevaluationdefinition-crd.yaml        |  2 +-
 .../keptnevaluationprovider-crd.yaml          |  2 +-
 .../chart/templates/keptntask-crd.yaml        |  2 +-
 .../templates/keptntaskdefinition-crd.yaml    |  2 +-
 .../chart/templates/keptnworkload-crd.yaml    |  2 +-
 .../templates/keptnworkloadinstance-crd.yaml  |  2 +-
 .../templates/keptnworkloadversion-crd.yaml   |  2 +-
 .../chart/templates/leader-election-rbac.yaml |  2 +-
 ...ecycle-mutating-webhook-configuration.yaml |  2 +-
 .../config/crd/kustomization.yaml             |  2 +-
 .../default/webhooknamespaces_patch.yaml      |  2 +-
 .../config/manager/manager.yaml               |  2 +-
 .../rbac/keptnappversion_editor_role.yaml     |  4 +-
 .../rbac/keptnappversion_viewer_role.yaml     |  4 +-
 ...e_keptnappcreationrequest_editor_role.yaml |  4 +-
 ...e_keptnappcreationrequest_viewer_role.yaml |  4 +-
 .../rbac/options_keptnconfig_editor_role.yaml |  4 +-
 .../rbac/options_keptnconfig_viewer_role.yaml |  4 +-
 .../lifecycle_v1alpha1_keptnappversion.yaml   |  4 +-
 .../samples/lifecycle_v1alpha2_keptnapp.yaml  |  4 +-
 .../lifecycle_v1alpha2_keptnappversion.yaml   |  4 +-
 ...ycle_v1alpha3_keptnappcreationrequest.yaml |  4 +-
 .../samples/options_v1alpha1_keptnconfig.yaml |  4 +-
 lifecycle-operator/go.mod                     |  2 +-
 lifecycle-operator/go.sum                     |  4 +-
 lifecycle-operator/main.go                    |  6 +--
 .../chart/templates/analysis-crd.yaml         |  2 +-
 .../templates/analysisdefinition-crd.yaml     |  2 +-
 .../templates/analysisvaluetemplate-crd.yaml  |  2 +-
 .../chart/templates/deployment.yaml           |  2 +-
 .../chart/templates/keptnmetric-crd.yaml      |  2 +-
 .../templates/keptnmetricsprovider-crd.yaml   |  2 +-
 .../config/crd/kustomization.yaml             |  2 +-
 metrics-operator/config/manager/manager.yaml  |  2 +-
 .../samples/metrics_v1alpha3_keptnmetric.yaml |  2 +-
 ...metrics_v1alpha3_keptnmetricsprovider.yaml |  2 +-
 .../samples/metrics_v1beta1_keptnmetric.yaml  |  2 +-
 .../metrics_v1beta1_keptnmetricsprovider.yaml |  2 +-
 metrics-operator/go.mod                       |  2 +-
 metrics-operator/go.sum                       |  4 +-
 metrics-operator/main.go                      |  6 +--
 73 files changed, 170 insertions(+), 170 deletions(-)

diff --git a/.github/scripts/.helm-tests/certificates-only/result.yaml b/.github/scripts/.helm-tests/certificates-only/result.yaml
index 3153ffbabc..fe9c67935f 100644
--- a/.github/scripts/.helm-tests/certificates-only/result.yaml
+++ b/.github/scripts/.helm-tests/certificates-only/result.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "helmtests"
   labels:
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -79,7 +79,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -139,7 +139,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -166,7 +166,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -192,7 +192,7 @@ metadata:
   namespace: "helmtests"
   labels:
     app.kubernetes.io/component: keptn-cert-manager
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: certificate-operator
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
index 869bd7cf7c..0581181603 100644
--- a/.github/scripts/.helm-tests/default/result.yaml
+++ b/.github/scripts/.helm-tests/default/result.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "helmtests"
   labels:
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -139,7 +139,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -404,7 +404,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -467,7 +467,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1286,7 +1286,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1356,7 +1356,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1741,7 +1741,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1934,7 +1934,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -2116,7 +2116,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -2528,7 +2528,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -4288,7 +4288,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -4580,7 +4580,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -5370,7 +5370,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -5698,7 +5698,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -6043,7 +6043,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -6730,7 +6730,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -6869,7 +6869,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -7380,7 +7380,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -8375,7 +8375,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -8536,7 +8536,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
@@ -8674,7 +8674,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -8698,7 +8698,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -8924,7 +8924,7 @@ metadata:
   namespace: "helmtests"
   labels:
     app.kubernetes.io/component: keptn-cert-manager
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: certificate-operator
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -9008,7 +9008,7 @@ metadata:
   name: lifecycle-operator
   namespace: "helmtests"
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: lifecycle-operator
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -9220,7 +9220,7 @@ metadata:
   name: metrics-operator
   namespace: "helmtests"
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/component: metrics-operator
     control-plane: metrics-operator
     keptn.sh/inject-cert: "true"
@@ -9383,7 +9383,7 @@ metadata:
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
     keptn.sh/inject-cert: "true"
-    app.kubernetes.io/part-of: "keptn-lifecycle-toolkit"
+    app.kubernetes.io/part-of: "keptn"
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
diff --git a/.github/scripts/.helm-tests/lifecycle-only/result.yaml b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
index 1fe77c440e..213c772837 100644
--- a/.github/scripts/.helm-tests/lifecycle-only/result.yaml
+++ b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
@@ -85,7 +85,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -350,7 +350,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -413,7 +413,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1232,7 +1232,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1302,7 +1302,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1687,7 +1687,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1880,7 +1880,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -2062,7 +2062,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -2474,7 +2474,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -4234,7 +4234,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -4526,7 +4526,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -5316,7 +5316,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -6298,7 +6298,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
@@ -6495,7 +6495,7 @@ metadata:
   name: lifecycle-operator
   namespace: "helmtests"
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: lifecycle-operator
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -6709,7 +6709,7 @@ metadata:
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
     keptn.sh/inject-cert: "true"
-    app.kubernetes.io/part-of: "keptn-lifecycle-toolkit"
+    app.kubernetes.io/part-of: "keptn"
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
index f836f43bdf..8462c0a297 100644
--- a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
+++ b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "helmtests"
   labels:
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -100,7 +100,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -365,7 +365,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -428,7 +428,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1247,7 +1247,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1317,7 +1317,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1702,7 +1702,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1895,7 +1895,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -2077,7 +2077,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -2489,7 +2489,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -4249,7 +4249,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -4541,7 +4541,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -5331,7 +5331,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -6323,7 +6323,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -6421,7 +6421,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
@@ -6514,7 +6514,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -6538,7 +6538,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -6667,7 +6667,7 @@ metadata:
   namespace: "helmtests"
   labels:
     app.kubernetes.io/component: keptn-cert-manager
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: certificate-operator
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -6751,7 +6751,7 @@ metadata:
   name: lifecycle-operator
   namespace: "helmtests"
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: lifecycle-operator
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -6965,7 +6965,7 @@ metadata:
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
     keptn.sh/inject-cert: "true"
-    app.kubernetes.io/part-of: "keptn-lifecycle-toolkit"
+    app.kubernetes.io/part-of: "keptn"
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: lifecycle-operator
diff --git a/.github/scripts/.helm-tests/metrics-only/result.yaml b/.github/scripts/.helm-tests/metrics-only/result.yaml
index caa6d6d0fa..468b7f9f0d 100644
--- a/.github/scripts/.helm-tests/metrics-only/result.yaml
+++ b/.github/scripts/.helm-tests/metrics-only/result.yaml
@@ -47,7 +47,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -392,7 +392,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1079,7 +1079,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1218,7 +1218,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1729,7 +1729,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -2263,7 +2263,7 @@ metadata:
   name: metrics-operator
   namespace: "helmtests"
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/component: metrics-operator
     control-plane: metrics-operator
     keptn.sh/inject-cert: "true"
diff --git a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml
index 6842b9f4bb..ee49a9f6ef 100644
--- a/.github/scripts/.helm-tests/metrics-with-certs/result.yaml
+++ b/.github/scripts/.helm-tests/metrics-with-certs/result.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "helmtests"
   labels:
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -62,7 +62,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -407,7 +407,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1094,7 +1094,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1233,7 +1233,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -1744,7 +1744,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: 'helmtests/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
     app.kubernetes.io/instance: keptn-test
@@ -2127,7 +2127,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -2291,7 +2291,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -2315,7 +2315,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: cert-manager
@@ -2435,7 +2435,7 @@ metadata:
   namespace: "helmtests"
   labels:
     app.kubernetes.io/component: keptn-cert-manager
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: certificate-operator
     app.kubernetes.io/instance: keptn-test
     app.kubernetes.io/managed-by: Helm
@@ -2519,7 +2519,7 @@ metadata:
   name: metrics-operator
   namespace: "helmtests"
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/component: metrics-operator
     control-plane: metrics-operator
     keptn.sh/inject-cert: "true"
diff --git a/chart/Chart.lock b/chart/Chart.lock
index 7c6cd69d47..b684df0f4e 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -8,5 +8,5 @@ dependencies:
 - name: keptn-metrics-operator
   repository: file://../metrics-operator/chart
   version: 0.1.0
-digest: sha256:c7488f31be35aaa90007b22da4dd2989b42db1a6d9473d8d7e3ef7d58aee5714
-generated: "2023-11-02T08:47:21.847373062+01:00"
+digest: sha256:ab7d035d4105c783c6d8914d455ecb41eb6b305ec6c1907bf2a2bbfa60bc95f0
+generated: "2023-11-24T07:22:41.600191654+01:00"
diff --git a/docs/content/en/contribute/software/dev-environ/_index.md b/docs/content/en/contribute/software/dev-environ/_index.md
index e0ea841dd8..340128e5a9 100644
--- a/docs/content/en/contribute/software/dev-environ/_index.md
+++ b/docs/content/en/contribute/software/dev-environ/_index.md
@@ -24,7 +24,7 @@ To prepare to contribute to the Keptn project, we recommend that you:
   * [lifecycle-operator](https://github.com/keptn/lifecycle-toolkit/tree/main/lifecycle-operator)
   * [metrics-operator](https://github.com/keptn/lifecycle-toolkit/tree/main/metrics-operator)
   * [scheduler](https://github.com/keptn/lifecycle-toolkit/tree/main/scheduler)
-  * [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/tree/main/klt-cert-manager)
+  * [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/tree/main/keptn-cert-manager)
 
   Each of these is described in the
   [Architecture](../../../docs/components/)
diff --git a/docs/content/en/docs/components/certificate-operator/_index.md b/docs/content/en/docs/components/certificate-operator/_index.md
index d5a0af07f1..58d1083191 100644
--- a/docs/content/en/docs/components/certificate-operator/_index.md
+++ b/docs/content/en/docs/components/certificate-operator/_index.md
@@ -18,7 +18,7 @@ Keptn includes a Mutating Webhook
 that requires TLS certificates to be mounted as a volume in its pod.
 In version 0.6.0 and later, the certificate creation
 is handled automatically by
-the [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/blob/main/klt-cert-manager/README.md).
+the [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/blob/main/keptn-cert-manager/README.md).
 
 How it works:
 
@@ -26,7 +26,7 @@ How it works:
 in the `keptn-lifecycle-toolkit-system` namespace
 with a renewal threshold of 12 hours.
 * If the certificate expires,
-the [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/blob/main/klt-cert-manager/README.md)
+the [keptn-cert-manager](https://github.com/keptn/lifecycle-toolkit/blob/main/keptn-cert-manager/README.md)
 renews it.
 * The Keptn `lifecycle-operator` waits for a valid certificate to be ready.
 * When the certificate is ready,
diff --git a/docs/content/en/docs/installation/configuration/namespace.md b/docs/content/en/docs/installation/configuration/namespace.md
index 011697f32f..ee552ae877 100644
--- a/docs/content/en/docs/installation/configuration/namespace.md
+++ b/docs/content/en/docs/installation/configuration/namespace.md
@@ -31,7 +31,7 @@ Some considerations for Keptn:
   resources that are used for pre- and post-deployment
   can reference metrics from any namespace.
   So you can create `KeptnMetrics` in a centralized namespace
-  (such as `keptn-lifecycle-toolkit`)
+  (such as `keptn-lifecycle-toolkit-system`)
   and access those metrics in evaluations on all namespaces in the cluster.
 * Analysis related resources
   ([Analysis](../../reference/crd-reference/analysis.md),
diff --git a/examples/Makefile b/examples/Makefile
index 350a420bea..ea4bfe78d0 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -7,7 +7,7 @@ GRAFANA_PORT_FORWARD ?= 3000
 .PHONY: install
 install: install-observability
 	@echo "-----------------------------------"
-	@echo "Create Namespace and install Keptn-lifecycle-toolkit"
+	@echo "Create Namespace and install Keptn"
 	@echo "-----------------------------------"
 	helm repo add keptn https://charts.lifecycle.keptn.sh
 	helm repo update
@@ -69,7 +69,7 @@ uninstall-argo: undeploy-podtatohead
 .PHONY: uninstall
 uninstall: uninstall-observability uninstall-argo
 	@echo "-----------------------------------"
-	@echo "Uninstall Keptn-lifecycle-toolkit"
+	@echo "Uninstall Keptn"
 	@echo "-----------------------------------"
 	helm uninstall keptn -n $(TOOLKIT_NAMESPACE)
 	kubectl delete ns $(TOOLKIT_NAMESPACE) --ignore-not-found=true
diff --git a/examples/sample-app/README.md b/examples/sample-app/README.md
index 7f354a2628..71ae7f3839 100644
--- a/examples/sample-app/README.md
+++ b/examples/sample-app/README.md
@@ -37,7 +37,7 @@ To enable Slack notification add `post-deployment-notification` in as a postDepl
     - post-deployment-notification
 ```
 
-## Deploy the Observability Part and Keptn-lifecycle-toolkit
+## Deploy the Observability Part and Keptn
 
 ```make install```
 
diff --git a/examples/support/argo/README.md b/examples/support/argo/README.md
index ff9abe9aa7..f728f0cc88 100644
--- a/examples/support/argo/README.md
+++ b/examples/support/argo/README.md
@@ -5,7 +5,7 @@ using Keptn and [ArgoCD](https://argo-cd.readthedocs.io/en/stable/).
 
 ## TL;DR
 
-* You can install ArgoCD and Keptn-lifecycle-toolkit using: `make install`
+* You can install ArgoCD and Keptn using: `make install`
 * Install argo CLI according to the instructions [here](https://argo-cd.readthedocs.io/en/stable/cli_installation/)
 * Afterward, you can fetch the secret for the ArgoCD CLI using: `make argo-get-password`
 * Then you can port-forward the ArgoUI using: `make port-forward-argocd`
diff --git a/examples/support/observability/README.md b/examples/support/observability/README.md
index cd719c8071..e5d6dea5b1 100644
--- a/examples/support/observability/README.md
+++ b/examples/support/observability/README.md
@@ -9,7 +9,7 @@ and [Prometheus](https://prometheus.io).
 The application deployed uses an example of pre-Deployment Evaluation
 based on prometheus metrics.
 
-- To install the whole demo, including Keptn-lifecycle-toolkit,
+- To install the whole demo, including Keptn,
   execute the following command:
 
   ```shell
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 59b0dc161d..219d74bb5e 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
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     {{- include "common.labels.standard" (dict "context" .) | nindent 4 }}
     {{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
diff --git a/keptn-cert-manager/chart/templates/certificate-operator-rbac.yaml b/keptn-cert-manager/chart/templates/certificate-operator-rbac.yaml
index 2eb36ffb89..dec5be0674 100644
--- a/keptn-cert-manager/chart/templates/certificate-operator-rbac.yaml
+++ b/keptn-cert-manager/chart/templates/certificate-operator-rbac.yaml
@@ -81,7 +81,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
   {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" . ) | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
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 2597f8d10e..1967876268 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
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
     {{- include "common.annotations" ( dict "context" . ) }}
 roleRef:
diff --git a/keptn-cert-manager/chart/templates/deployment.yaml b/keptn-cert-manager/chart/templates/deployment.yaml
index 9454ce2feb..711db681ff 100644
--- a/keptn-cert-manager/chart/templates/deployment.yaml
+++ b/keptn-cert-manager/chart/templates/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     app.kubernetes.io/component: keptn-cert-manager
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: certificate-operator
     {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
     {{- include "common.annotations" ( dict "context" . ) }}
diff --git a/keptn-cert-manager/chart/templates/service-account.yaml b/keptn-cert-manager/chart/templates/service-account.yaml
index e465673575..a7fdbc27be 100644
--- a/keptn-cert-manager/chart/templates/service-account.yaml
+++ b/keptn-cert-manager/chart/templates/service-account.yaml
@@ -5,6 +5,6 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     {{- include "common.labels.standard" ( dict "context" $ ) | nindent 4 }}
     {{- include "common.annotations" ( dict "context" . ) }}
diff --git a/keptn-cert-manager/config/manager/manager.yaml b/keptn-cert-manager/config/manager/manager.yaml
index 87558db2e1..04ee2daf05 100644
--- a/keptn-cert-manager/config/manager/manager.yaml
+++ b/keptn-cert-manager/config/manager/manager.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/instance: certificate-operator
     app.kubernetes.io/component: keptn-cert-manager
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
diff --git a/keptn-cert-manager/config/rbac/extra_role_binding.yaml b/keptn-cert-manager/config/rbac/extra_role_binding.yaml
index 3efddd2fb9..799cc99960 100644
--- a/keptn-cert-manager/config/rbac/extra_role_binding.yaml
+++ b/keptn-cert-manager/config/rbac/extra_role_binding.yaml
@@ -11,7 +11,7 @@ metadata:
     app.kubernetes.io/instance: certificate-operator-rolebinding
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: certificate-operator-role-binding
 roleRef:
diff --git a/keptn-cert-manager/config/rbac/leader_election_role.yaml b/keptn-cert-manager/config/rbac/leader_election_role.yaml
index 2daacbd257..94a7aaea76 100644
--- a/keptn-cert-manager/config/rbac/leader_election_role.yaml
+++ b/keptn-cert-manager/config/rbac/leader_election_role.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/instance: leader-election-role
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: leader-election-role
 rules:
diff --git a/keptn-cert-manager/config/rbac/leader_election_role_binding.yaml b/keptn-cert-manager/config/rbac/leader_election_role_binding.yaml
index fcb26e9ad6..bebc070765 100644
--- a/keptn-cert-manager/config/rbac/leader_election_role_binding.yaml
+++ b/keptn-cert-manager/config/rbac/leader_election_role_binding.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: certificate-operator-leader-election-rolebinding
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: certificate-operator-leader-election-rolebinding
 roleRef:
diff --git a/keptn-cert-manager/config/rbac/role_binding.yaml b/keptn-cert-manager/config/rbac/role_binding.yaml
index 8c6f9b0244..9af6f7b6cf 100644
--- a/keptn-cert-manager/config/rbac/role_binding.yaml
+++ b/keptn-cert-manager/config/rbac/role_binding.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: certificate-operator-rolebinding
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: certificate-operator-rolebinding
 roleRef:
diff --git a/keptn-cert-manager/config/rbac/service_account.yaml b/keptn-cert-manager/config/rbac/service_account.yaml
index a2806bad47..2c867dbf74 100644
--- a/keptn-cert-manager/config/rbac/service_account.yaml
+++ b/keptn-cert-manager/config/rbac/service_account.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: certificate-operator
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: certificate-operator
   namespace: system
diff --git a/lifecycle-operator/PROJECT b/lifecycle-operator/PROJECT
index 874d841800..ade614adf0 100644
--- a/lifecycle-operator/PROJECT
+++ b/lifecycle-operator/PROJECT
@@ -2,7 +2,7 @@ domain: keptn.sh
 layout:
 - go.kubebuilder.io/v3
 multigroup: true
-projectName: keptn-lifecycle-toolkit
+projectName: keptn
 repo: github.com/keptn/lifecycle-toolkit/lifecycle-operator
 resources:
 - api:
diff --git a/lifecycle-operator/chart/templates/deployment.yaml b/lifecycle-operator/chart/templates/deployment.yaml
index 77a0a85433..09ad3fd4d7 100644
--- a/lifecycle-operator/chart/templates/deployment.yaml
+++ b/lifecycle-operator/chart/templates/deployment.yaml
@@ -25,7 +25,7 @@ metadata:
   name: lifecycle-operator
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: lifecycle-operator
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnapp-crd.yaml b/lifecycle-operator/chart/templates/keptnapp-crd.yaml
index 58ef54c6e5..2667cad9e6 100644
--- a/lifecycle-operator/chart/templates/keptnapp-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnapp-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnappcreationrequest-crd.yaml b/lifecycle-operator/chart/templates/keptnappcreationrequest-crd.yaml
index 1b66681f41..607eb65dcc 100644
--- a/lifecycle-operator/chart/templates/keptnappcreationrequest-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnappcreationrequest-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnappversion-crd.yaml b/lifecycle-operator/chart/templates/keptnappversion-crd.yaml
index 6545d6661d..ca08c0c893 100644
--- a/lifecycle-operator/chart/templates/keptnappversion-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnappversion-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnconfig-crd.yaml b/lifecycle-operator/chart/templates/keptnconfig-crd.yaml
index a3684ba416..d7143ac512 100644
--- a/lifecycle-operator/chart/templates/keptnconfig-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnconfig-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnevaluation-crd.yaml b/lifecycle-operator/chart/templates/keptnevaluation-crd.yaml
index 3dd0077e14..e61574f4f6 100644
--- a/lifecycle-operator/chart/templates/keptnevaluation-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnevaluation-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnevaluationdefinition-crd.yaml b/lifecycle-operator/chart/templates/keptnevaluationdefinition-crd.yaml
index 14fd4fe290..6cdd53af53 100644
--- a/lifecycle-operator/chart/templates/keptnevaluationdefinition-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnevaluationdefinition-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnevaluationprovider-crd.yaml b/lifecycle-operator/chart/templates/keptnevaluationprovider-crd.yaml
index 4e76b46a3a..e42f15df72 100644
--- a/lifecycle-operator/chart/templates/keptnevaluationprovider-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnevaluationprovider-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptntask-crd.yaml b/lifecycle-operator/chart/templates/keptntask-crd.yaml
index 6fbd2534ac..f8d32a92ec 100644
--- a/lifecycle-operator/chart/templates/keptntask-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptntask-crd.yaml
@@ -7,7 +7,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptntaskdefinition-crd.yaml b/lifecycle-operator/chart/templates/keptntaskdefinition-crd.yaml
index 3d821d1fda..97601c0d9c 100644
--- a/lifecycle-operator/chart/templates/keptntaskdefinition-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptntaskdefinition-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnworkload-crd.yaml b/lifecycle-operator/chart/templates/keptnworkload-crd.yaml
index 14d0fec49a..d1e71d9172 100644
--- a/lifecycle-operator/chart/templates/keptnworkload-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnworkload-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnworkloadinstance-crd.yaml b/lifecycle-operator/chart/templates/keptnworkloadinstance-crd.yaml
index d15a12d120..40fe0f649d 100644
--- a/lifecycle-operator/chart/templates/keptnworkloadinstance-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnworkloadinstance-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml b/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml
index 624a1c5743..1754d8631c 100644
--- a/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml
+++ b/lifecycle-operator/chart/templates/keptnworkloadversion-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: lifecycle.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/lifecycle-operator/chart/templates/leader-election-rbac.yaml b/lifecycle-operator/chart/templates/leader-election-rbac.yaml
index 621c2b25d9..8534296a23 100644
--- a/lifecycle-operator/chart/templates/leader-election-rbac.yaml
+++ b/lifecycle-operator/chart/templates/leader-election-rbac.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: certificate-operator
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
 {{- include "common.annotations" ( dict "context" . ) }}
 rules:
diff --git a/lifecycle-operator/chart/templates/lifecycle-mutating-webhook-configuration.yaml b/lifecycle-operator/chart/templates/lifecycle-mutating-webhook-configuration.yaml
index dfdf0ff0ea..05fda5560f 100644
--- a/lifecycle-operator/chart/templates/lifecycle-mutating-webhook-configuration.yaml
+++ b/lifecycle-operator/chart/templates/lifecycle-mutating-webhook-configuration.yaml
@@ -6,7 +6,7 @@ metadata:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
     keptn.sh/inject-cert: "true"
-    app.kubernetes.io/part-of: "keptn-lifecycle-toolkit"
+    app.kubernetes.io/part-of: "keptn"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
 {{- include "common.annotations" ( dict "context" . ) }}
 webhooks:
diff --git a/lifecycle-operator/config/crd/kustomization.yaml b/lifecycle-operator/config/crd/kustomization.yaml
index 27ef1924fc..6dd871233b 100644
--- a/lifecycle-operator/config/crd/kustomization.yaml
+++ b/lifecycle-operator/config/crd/kustomization.yaml
@@ -24,7 +24,7 @@ kind: Kustomization
 labels:
   - includeSelectors: true
     pairs:
-      app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+      app.kubernetes.io/part-of: keptn
       crdGroup: lifecycle.keptn.sh
       keptn.sh/inject-cert: "true"
 patches:
diff --git a/lifecycle-operator/config/default/webhooknamespaces_patch.yaml b/lifecycle-operator/config/default/webhooknamespaces_patch.yaml
index 6b5655410a..7ea4daf056 100644
--- a/lifecycle-operator/config/default/webhooknamespaces_patch.yaml
+++ b/lifecycle-operator/config/default/webhooknamespaces_patch.yaml
@@ -4,7 +4,7 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: lifecycle-mutating-webhook-configuration
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
 # Add an exclusion rule for the Mutating Webhook since the lifecycle-operator pod will not be able to start since it's waiting for
 # itself otherwise control-plane: controller-manager
 webhooks:
diff --git a/lifecycle-operator/config/manager/manager.yaml b/lifecycle-operator/config/manager/manager.yaml
index a5e4a9c6b3..1e8fa3ed9b 100644
--- a/lifecycle-operator/config/manager/manager.yaml
+++ b/lifecycle-operator/config/manager/manager.yaml
@@ -4,7 +4,7 @@ metadata:
   name: lifecycle-operator
   namespace: system
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/component: lifecycle-operator
     control-plane: lifecycle-operator
     keptn.sh/inject-cert: "true"
diff --git a/lifecycle-operator/config/rbac/keptnappversion_editor_role.yaml b/lifecycle-operator/config/rbac/keptnappversion_editor_role.yaml
index 0de6300ff9..893076c496 100644
--- a/lifecycle-operator/config/rbac/keptnappversion_editor_role.yaml
+++ b/lifecycle-operator/config/rbac/keptnappversion_editor_role.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: keptnappversion-editor-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: keptnappversion-editor-role
 rules:
diff --git a/lifecycle-operator/config/rbac/keptnappversion_viewer_role.yaml b/lifecycle-operator/config/rbac/keptnappversion_viewer_role.yaml
index 56f808c471..f2f2641e89 100644
--- a/lifecycle-operator/config/rbac/keptnappversion_viewer_role.yaml
+++ b/lifecycle-operator/config/rbac/keptnappversion_viewer_role.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: keptnappversion-viewer-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: keptnappversion-viewer-role
 rules:
diff --git a/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml
index e2924ac1e1..f9403d57ef 100644
--- a/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml
+++ b/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: keptnappcreationrequest-editor-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: keptnappcreationrequest-editor-role
 rules:
diff --git a/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml
index f4617c57ea..6bce6fe959 100644
--- a/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml
+++ b/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: keptnappcreationrequest-viewer-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: keptnappcreationrequest-viewer-role
 rules:
diff --git a/lifecycle-operator/config/rbac/options_keptnconfig_editor_role.yaml b/lifecycle-operator/config/rbac/options_keptnconfig_editor_role.yaml
index 90b8c7f390..8f7ed653f2 100644
--- a/lifecycle-operator/config/rbac/options_keptnconfig_editor_role.yaml
+++ b/lifecycle-operator/config/rbac/options_keptnconfig_editor_role.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: keptnconfig-editor-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: keptnconfig-editor-role
 rules:
diff --git a/lifecycle-operator/config/rbac/options_keptnconfig_viewer_role.yaml b/lifecycle-operator/config/rbac/options_keptnconfig_viewer_role.yaml
index bd72db72d4..b5d511a3d1 100644
--- a/lifecycle-operator/config/rbac/options_keptnconfig_viewer_role.yaml
+++ b/lifecycle-operator/config/rbac/options_keptnconfig_viewer_role.yaml
@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: keptnconfig-viewer-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
   name: keptnconfig-viewer-role
 rules:
diff --git a/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnappversion.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnappversion.yaml
index e3ccdb6388..d90c1656fd 100644
--- a/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnappversion.yaml
+++ b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnappversion.yaml
@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnappversion
     app.kubernetes.io/instance: keptnappversion-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
   name: keptnappversion-sample
 spec:
 # TODO(user): Add fields here
diff --git a/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnapp.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnapp.yaml
index b5bf65be62..b1a7ee2151 100644
--- a/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnapp.yaml
+++ b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnapp.yaml
@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnapp
     app.kubernetes.io/instance: keptnapp-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
   name: keptnapp-sample
 spec:
 # TODO(user): Add fields here
diff --git a/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnappversion.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnappversion.yaml
index 66469eeb32..f76e707dba 100644
--- a/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnappversion.yaml
+++ b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnappversion.yaml
@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnappversion
     app.kubernetes.io/instance: keptnappversion-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
   name: keptnappversion-sample
 spec:
 # TODO(user): Add fields here
diff --git a/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml
index 3bda2955d9..8a2b12fe2f 100644
--- a/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml
+++ b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml
@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnappcreationrequest
     app.kubernetes.io/instance: keptnappcreationrequest-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
   name: keptnappcreationrequest-sample
 spec:
   appName: my-app
diff --git a/lifecycle-operator/config/samples/options_v1alpha1_keptnconfig.yaml b/lifecycle-operator/config/samples/options_v1alpha1_keptnconfig.yaml
index c34831fd36..95f1e9dac6 100644
--- a/lifecycle-operator/config/samples/options_v1alpha1_keptnconfig.yaml
+++ b/lifecycle-operator/config/samples/options_v1alpha1_keptnconfig.yaml
@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnconfig
     app.kubernetes.io/instance: keptnconfig-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: keptn-lifecycle-toolkit
+    app.kubernetes.io/created-by: keptn
     control-plane: lifecycle-operator
   name: keptnconfig-sample
 spec:
diff --git a/lifecycle-operator/go.mod b/lifecycle-operator/go.mod
index 4755180aa3..b8a62d4a44 100644
--- a/lifecycle-operator/go.mod
+++ b/lifecycle-operator/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/cloudevents/sdk-go/v2 v2.14.0
 	github.com/go-logr/logr v1.3.0
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20231120074405-964fd259c5e5
+	github.com/keptn/lifecycle-toolkit/keptn-cert-manager v0.0.0-20231124074009-15b0ac0b36b8
 	github.com/magiconair/properties v1.8.7
 	github.com/onsi/ginkgo/v2 v2.13.1
 	github.com/onsi/gomega v1.30.0
diff --git a/lifecycle-operator/go.sum b/lifecycle-operator/go.sum
index adf87465ea..539700c43c 100644
--- a/lifecycle-operator/go.sum
+++ b/lifecycle-operator/go.sum
@@ -190,8 +190,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
-github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20231120074405-964fd259c5e5 h1:Wj69DXOsYkGDT4ODzsb1JILMA2H2eFG3ZG20aG9/oNs=
-github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20231120074405-964fd259c5e5/go.mod h1:ijcMtVqYPFlcfl1A8V0kyb1ytWTMBs0PwN6UXQxha+M=
+github.com/keptn/lifecycle-toolkit/keptn-cert-manager v0.0.0-20231124074009-15b0ac0b36b8 h1:zZdRayIIzFxd7PQG7n5vI6BU+U14y5ILgMnmIQ7sdh4=
+github.com/keptn/lifecycle-toolkit/keptn-cert-manager v0.0.0-20231124074009-15b0ac0b36b8/go.mod h1:8a1E7DJENAWIBTIK8FipZQdo7ccEQE8OSYBt197K/yA=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
diff --git a/lifecycle-operator/main.go b/lifecycle-operator/main.go
index dde5cd54c0..5954d313e7 100644
--- a/lifecycle-operator/main.go
+++ b/lifecycle-operator/main.go
@@ -27,9 +27,9 @@ import (
 	argov1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
 	ce "github.com/cloudevents/sdk-go/v2"
 	"github.com/kelseyhightower/envconfig"
-	"github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/certificates"
-	certCommon "github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/common"
-	"github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/webhook"
+	"github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/certificates"
+	certCommon "github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/common"
+	"github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/webhook"
 	lifecyclev1alpha1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1"
 	lifecyclev1alpha2 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2"
 	lifecyclev1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3"
diff --git a/metrics-operator/chart/templates/analysis-crd.yaml b/metrics-operator/chart/templates/analysis-crd.yaml
index 38bd3919ab..817f436100 100644
--- a/metrics-operator/chart/templates/analysis-crd.yaml
+++ b/metrics-operator/chart/templates/analysis-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/metrics-operator/chart/templates/analysisdefinition-crd.yaml b/metrics-operator/chart/templates/analysisdefinition-crd.yaml
index 355927612a..c0525d7462 100644
--- a/metrics-operator/chart/templates/analysisdefinition-crd.yaml
+++ b/metrics-operator/chart/templates/analysisdefinition-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml b/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml
index ae7b2bcbe8..d0445d4251 100644
--- a/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml
+++ b/metrics-operator/chart/templates/analysisvaluetemplate-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/metrics-operator/chart/templates/deployment.yaml b/metrics-operator/chart/templates/deployment.yaml
index d7afb9a4f2..703bcd8a3d 100644
--- a/metrics-operator/chart/templates/deployment.yaml
+++ b/metrics-operator/chart/templates/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: metrics-operator
   namespace: {{ .Release.Namespace | quote }}
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/component: metrics-operator
     control-plane: metrics-operator
     keptn.sh/inject-cert: "true"
diff --git a/metrics-operator/chart/templates/keptnmetric-crd.yaml b/metrics-operator/chart/templates/keptnmetric-crd.yaml
index 90d7856073..6ae2a6debd 100644
--- a/metrics-operator/chart/templates/keptnmetric-crd.yaml
+++ b/metrics-operator/chart/templates/keptnmetric-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml b/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml
index c750873149..84b0132a41 100644
--- a/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml
+++ b/metrics-operator/chart/templates/keptnmetricsprovider-crd.yaml
@@ -6,7 +6,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.13.0
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/keptn-certs'
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     crdGroup: metrics.keptn.sh
     keptn.sh/inject-cert: "true"
 {{- include "common.labels.standard" ( dict "context" . ) | nindent 4 }}
diff --git a/metrics-operator/config/crd/kustomization.yaml b/metrics-operator/config/crd/kustomization.yaml
index d804a89d04..5da9dc30f8 100644
--- a/metrics-operator/config/crd/kustomization.yaml
+++ b/metrics-operator/config/crd/kustomization.yaml
@@ -18,7 +18,7 @@ kind: Kustomization
 labels:
   - includeSelectors: true
     Pairs:
-      app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+      app.kubernetes.io/part-of: keptn
       crdGroup: metrics.keptn.sh
       keptn.sh/inject-cert: "true"
 patches:
diff --git a/metrics-operator/config/manager/manager.yaml b/metrics-operator/config/manager/manager.yaml
index 2d7a0aa755..95a1c42d9d 100644
--- a/metrics-operator/config/manager/manager.yaml
+++ b/metrics-operator/config/manager/manager.yaml
@@ -11,7 +11,7 @@ metadata:
   name: metrics-operator
   namespace: system
   labels:
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     control-plane: metrics-operator
     app.kubernetes.io/component: metrics-operator
     keptn.sh/inject-cert: "true"
diff --git a/metrics-operator/config/samples/metrics_v1alpha3_keptnmetric.yaml b/metrics-operator/config/samples/metrics_v1alpha3_keptnmetric.yaml
index b29d10e3e7..0a022727f7 100644
--- a/metrics-operator/config/samples/metrics_v1alpha3_keptnmetric.yaml
+++ b/metrics-operator/config/samples/metrics_v1alpha3_keptnmetric.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnmetric
     app.kubernetes.io/instance: keptnmetric-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/created-by: metrics-operator
   name: keptnmetric-sample
diff --git a/metrics-operator/config/samples/metrics_v1alpha3_keptnmetricsprovider.yaml b/metrics-operator/config/samples/metrics_v1alpha3_keptnmetricsprovider.yaml
index 328a61715a..157b4c58ac 100644
--- a/metrics-operator/config/samples/metrics_v1alpha3_keptnmetricsprovider.yaml
+++ b/metrics-operator/config/samples/metrics_v1alpha3_keptnmetricsprovider.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnmetricsprovider
     app.kubernetes.io/instance: keptnmetricsprovider-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/created-by: metrics-operator
   name: keptnmetricsprovider-sample
diff --git a/metrics-operator/config/samples/metrics_v1beta1_keptnmetric.yaml b/metrics-operator/config/samples/metrics_v1beta1_keptnmetric.yaml
index c2b26cedfa..d8aa4dcf85 100644
--- a/metrics-operator/config/samples/metrics_v1beta1_keptnmetric.yaml
+++ b/metrics-operator/config/samples/metrics_v1beta1_keptnmetric.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnmetric
     app.kubernetes.io/instance: keptnmetric-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/created-by: metrics-operator
   name: keptnmetric-sample
diff --git a/metrics-operator/config/samples/metrics_v1beta1_keptnmetricsprovider.yaml b/metrics-operator/config/samples/metrics_v1beta1_keptnmetricsprovider.yaml
index c620027c12..efcc2c0e7b 100644
--- a/metrics-operator/config/samples/metrics_v1beta1_keptnmetricsprovider.yaml
+++ b/metrics-operator/config/samples/metrics_v1beta1_keptnmetricsprovider.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: keptnmetricsprovider
     app.kubernetes.io/instance: keptnmetricsprovider-sample
-    app.kubernetes.io/part-of: keptn-lifecycle-toolkit
+    app.kubernetes.io/part-of: keptn
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/created-by: metrics-operator
   name: keptnmetricsprovider-sample
diff --git a/metrics-operator/go.mod b/metrics-operator/go.mod
index 20bf9c465b..ec3bfbb9dc 100644
--- a/metrics-operator/go.mod
+++ b/metrics-operator/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/go-logr/logr v1.3.0
 	github.com/gorilla/mux v1.8.1
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20231120074405-964fd259c5e5
+	github.com/keptn/lifecycle-toolkit/keptn-cert-manager v0.0.0-20231124074009-15b0ac0b36b8
 	github.com/open-feature/go-sdk v1.8.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.17.0
diff --git a/metrics-operator/go.sum b/metrics-operator/go.sum
index e5639d8eab..6ab6743eba 100644
--- a/metrics-operator/go.sum
+++ b/metrics-operator/go.sum
@@ -227,8 +227,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
-github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20231120074405-964fd259c5e5 h1:Wj69DXOsYkGDT4ODzsb1JILMA2H2eFG3ZG20aG9/oNs=
-github.com/keptn/lifecycle-toolkit/klt-cert-manager v0.0.0-20231120074405-964fd259c5e5/go.mod h1:ijcMtVqYPFlcfl1A8V0kyb1ytWTMBs0PwN6UXQxha+M=
+github.com/keptn/lifecycle-toolkit/keptn-cert-manager v0.0.0-20231124074009-15b0ac0b36b8 h1:zZdRayIIzFxd7PQG7n5vI6BU+U14y5ILgMnmIQ7sdh4=
+github.com/keptn/lifecycle-toolkit/keptn-cert-manager v0.0.0-20231124074009-15b0ac0b36b8/go.mod h1:8a1E7DJENAWIBTIK8FipZQdo7ccEQE8OSYBt197K/yA=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
diff --git a/metrics-operator/main.go b/metrics-operator/main.go
index c07cef53db..9fa27ecf45 100644
--- a/metrics-operator/main.go
+++ b/metrics-operator/main.go
@@ -27,9 +27,9 @@ import (
 	"time"
 
 	"github.com/kelseyhightower/envconfig"
-	"github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/certificates"
-	certCommon "github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/common"
-	certwebhook "github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/webhook"
+	"github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/certificates"
+	certCommon "github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/common"
+	certwebhook "github.com/keptn/lifecycle-toolkit/keptn-cert-manager/pkg/webhook"
 	metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1beta1"
 	"github.com/keptn/lifecycle-toolkit/metrics-operator/cmd/metrics/adapter"
 	analysiscontroller "github.com/keptn/lifecycle-toolkit/metrics-operator/controllers/analysis"