diff --git a/klt-cert-manager/main.go b/klt-cert-manager/main.go
index b0e52664ac..15b352c577 100644
--- a/klt-cert-manager/main.go
+++ b/klt-cert-manager/main.go
@@ -12,9 +12,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
diff --git a/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml
index 8033598230..188c53434e 100644
--- a/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml
+++ b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.1
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: keptntaskdefinitions.lifecycle.keptn.sh
 spec:
   group: lifecycle.keptn.sh
diff --git a/lifecycle-operator/controllers/lifecycle/keptntask/job_utils_test.go b/lifecycle-operator/controllers/lifecycle/keptntask/job_utils_test.go
index bf8de7136e..3f97ff5999 100644
--- a/lifecycle-operator/controllers/lifecycle/keptntask/job_utils_test.go
+++ b/lifecycle-operator/controllers/lifecycle/keptntask/job_utils_test.go
@@ -2,13 +2,13 @@ package keptntask
 
 import (
 	"context"
-	fakeclient "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake"
 	"testing"
 
 	klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3"
 	apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common"
 	"github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common"
 	controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common"
+	fakeclient "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake"
 	"github.com/stretchr/testify/require"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
diff --git a/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go
index 9a9dc01c12..692c437bf8 100644
--- a/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go
+++ b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go
@@ -3,7 +3,6 @@ package keptnworkloadinstance
 import (
 	"context"
 	"fmt"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"strings"
 	"testing"
 	"time"
@@ -25,6 +24,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	k8sfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
diff --git a/lifecycle-operator/test/component/task/task_test.go b/lifecycle-operator/test/component/task/task_test.go
index 20ced4ae92..03cd4b4625 100644
--- a/lifecycle-operator/test/component/task/task_test.go
+++ b/lifecycle-operator/test/component/task/task_test.go
@@ -209,11 +209,12 @@ var _ = Describe("Task", Ordered, func() {
 				Expect(err).To(BeNil())
 
 				Expect(createdJob.Annotations).To(Equal(map[string]string{
-					"annotation1":        "annotation2",
-					"keptn.sh/task-name": task.Name,
-					"keptn.sh/version":   "",
-					"keptn.sh/workload":  "my-workload",
-					"keptn.sh/app":       "my-app",
+					"annotation1":                      "annotation2",
+					"keptn.sh/task-name":               task.Name,
+					"keptn.sh/version":                 "",
+					"keptn.sh/workload":                "my-workload",
+					"keptn.sh/app":                     "my-app",
+					"batch.kubernetes.io/job-tracking": "",
 				}))
 
 				Expect(createdJob.Labels).To(Equal(map[string]string{