diff --git a/components/buildless-serverless/config/crd/kustomization.yaml b/components/buildless-serverless/config/crd/kustomization.yaml
index 2bc7d1a04..9d15769e3 100644
--- a/components/buildless-serverless/config/crd/kustomization.yaml
+++ b/components/buildless-serverless/config/crd/kustomization.yaml
@@ -2,10 +2,11 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/serverless.kyma-project.io_functions.yaml
-# +kubebuilder:scaffold:crdkustomizeresource
-
+  - bases/serverless.kyma-project.io_functions.yaml
+  # +kubebuilder:scaffold:crdkustomizeresource
 patches:
+commonLabels:
+  app.kubernetes.io/version: 1.6.0
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 # +kubebuilder:scaffold:crdkustomizewebhookpatch
diff --git a/components/serverless/config/crd/kustomization.yaml b/components/serverless/config/crd/kustomization.yaml
index 1ecec5765..f27932a54 100644
--- a/components/serverless/config/crd/kustomization.yaml
+++ b/components/serverless/config/crd/kustomization.yaml
@@ -16,25 +16,18 @@ resources:
 #- patches/cainjection_in_functions.yaml
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch
 patches:
-  - patch: |
-      - op: add
-        path: "/metadata/labels"
-        value: 
-          app.kubernetes.io/component: serverless
-          app.kubernetes.io/instance: functions.serverless.kyma-project.io
+  - patch: "- op: add\n  path: \"/metadata/labels\"\n  value: \n    app.kubernetes.io/component: serverless\n    app.kubernetes.io/instance: functions.serverless.kyma-project.io\n"
     target:
       group: apiextensions.k8s.io
       version: v1
       kind: CustomResourceDefinition
       name: functions.serverless.kyma-project.io
-
 commonLabels:
   kyma-project.io/module: serverless
   app.kubernetes.io/name: serverless
-  app.kubernetes.io/version: "main"
+  app.kubernetes.io/version: "1.6.0"
   app.kubernetes.io/part-of: serverless
   app.kubernetes.io/managed-by: kustomize
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
-- kustomizeconfig.yaml
+  - kustomizeconfig.yaml
diff --git a/config/buildless-serverless/templates/crds.yaml b/config/buildless-serverless/templates/crds.yaml
index 89d9495e5..cd567f5a5 100644
--- a/config/buildless-serverless/templates/crds.yaml
+++ b/config/buildless-serverless/templates/crds.yaml
@@ -3,6 +3,8 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.4
+  labels:
+    app.kubernetes.io/version: 1.6.0
   name: functions.serverless.kyma-project.io
 spec:
   group: serverless.kyma-project.io
diff --git a/config/buildless-serverless/values.yaml b/config/buildless-serverless/values.yaml
index c441847b8..76bc70ea5 100644
--- a/config/buildless-serverless/values.yaml
+++ b/config/buildless-serverless/values.yaml
@@ -4,13 +4,13 @@ global:
   images:
     function_controller:
       name: "function-buildless-controller"
-      version: "main"
+      version: "1.6.0"
       directory: "prod"
     function_runtime_nodejs20:
       name: "function-runtime-nodejs20"
-      version: "main"
+      version: "1.6.0"
       directory: "prod"
     function_runtime_python312:
       name: "function-runtime-python312"
-      version: "main"
+      version: "1.6.0"
       directory: "prod"
diff --git a/config/serverless/templates/crds.yaml b/config/serverless/templates/crds.yaml
index d5782b10a..df7db9d17 100644
--- a/config/serverless/templates/crds.yaml
+++ b/config/serverless/templates/crds.yaml
@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: serverless
     app.kubernetes.io/part-of: serverless
-    app.kubernetes.io/version: main
+    app.kubernetes.io/version: 1.6.0
     kyma-project.io/module: serverless
   name: functions.serverless.kyma-project.io
 spec:
diff --git a/config/serverless/values.yaml b/config/serverless/values.yaml
index d5f05e66f..cc8d47035 100644
--- a/config/serverless/values.yaml
+++ b/config/serverless/values.yaml
@@ -76,11 +76,11 @@ global:
   images:
     function_controller:
       name: "function-controller"
-      version: "main"
+      version: "1.6.0"
       directory: "prod"
     function_build_init:
       name: "function-build-init"
-      version: "main"
+      version: "1.6.0"
       directory: "prod"
     registry_init: # https://github.com/kyma-project/docker-registry/tree/main/components/registry-init
       name: "registry-init"
@@ -88,15 +88,15 @@ global:
       directory: "prod"
     function_runtime_nodejs20:
       name: "function-runtime-nodejs20"
-      version: "main"
+      version: "1.6.0"
       directory: "prod"
     function_runtime_nodejs22:
       name: "function-runtime-nodejs22"
-      version: "main"
+      version: "1.6.0"
       directory: "prod"
     function_runtime_python312:
       name: "function-runtime-python312"
-      version: "main"
+      version: "1.6.0"
       directory: "prod"
     kaniko_executor:
       name: "gcr.io/kaniko-project/executor"
diff --git a/libgit2 b/libgit2
new file mode 160000
index 000000000..26c68a273
--- /dev/null
+++ b/libgit2
@@ -0,0 +1 @@
+Subproject commit 26c68a273939acc329416c3ef5aa9e61647bbb78
diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml
index cc1af9d11..a760ed115 100644
--- a/sec-scanners-config.yaml
+++ b/sec-scanners-config.yaml
@@ -1,15 +1,15 @@
 module-name: serverless
 rc-tag: 1.5.0
 protecode:
-  - europe-docker.pkg.dev/kyma-project/prod/serverless-operator:main
-  - europe-docker.pkg.dev/kyma-project/prod/function-controller:main
-  - europe-docker.pkg.dev/kyma-project/prod/function-build-init:main
-  - europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs20:main
-  - europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs22:main
-  - europe-docker.pkg.dev/kyma-project/prod/function-runtime-python312:main
+  - europe-docker.pkg.dev/kyma-project/prod/serverless-operator:1.6.0
+  - europe-docker.pkg.dev/kyma-project/prod/function-controller:1.6.0
+  - europe-docker.pkg.dev/kyma-project/prod/function-build-init:1.6.0
+  - europe-docker.pkg.dev/kyma-project/prod/registry-init:v20240506-57d31b1d
+  - europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs20:1.6.0
+  - europe-docker.pkg.dev/kyma-project/prod/function-runtime-nodejs22:1.6.0
+  - europe-docker.pkg.dev/kyma-project/prod/function-runtime-python312:1.6.0
   - europe-docker.pkg.dev/kyma-project/prod/external/gcr.io/kaniko-project/executor:v1.23.2
   - europe-docker.pkg.dev/kyma-project/prod/external/library/registry:2.8.3-v1
-  - europe-docker.pkg.dev/kyma-project/prod/registry-init:v20240506-57d31b1d
 whitesource:
   language: golang-mod
   subprojects: false