diff --git a/charts/core-crd/Chart.yaml b/charts/core-crd/Chart.yaml
index 5062b58..53f3a09 100644
--- a/charts/core-crd/Chart.yaml
+++ b/charts/core-crd/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: core-crd
 description: A Helm chart for Kubernetes
 type: application
-version: 3.2.1
-appVersion: "v3.2.1"
+version: 3.3.3
+appVersion: "v3.3.3"
 maintainers:
   - name: Calyptia
     email: hello@calyptia.com
diff --git a/charts/core-crd/values.yaml b/charts/core-crd/values.yaml
index 1f247c1..41d2b7a 100644
--- a/charts/core-crd/values.yaml
+++ b/charts/core-crd/values.yaml
@@ -9,7 +9,7 @@ images:
   fluentBit:
     registry: ghcr.io
     repository: calyptia/core/calyptia-fluent-bit
-    tag: 24.7.4
+    tag: 24.9.1
     pullSecrets: []
   ingestCheck:
     registry: ghcr.io
diff --git a/charts/core-instance/Chart.yaml b/charts/core-instance/Chart.yaml
index f31b2ff..bda52a9 100644
--- a/charts/core-instance/Chart.yaml
+++ b/charts/core-instance/Chart.yaml
@@ -4,8 +4,8 @@ description: Calyptia Core Instance chart
 home: https://calyptia.com/products/core/
 icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
 type: application
-version: 3.2.1
-appVersion: "v3.2.1"
+version: 3.3.3
+appVersion: "v3.3.3"
 maintainers:
   - name: Calyptia
     email: hello@calyptia.com
diff --git a/charts/core-instance/templates/deployment.yaml b/charts/core-instance/templates/deployment.yaml
index 04fddec..e10936a 100644
--- a/charts/core-instance/templates/deployment.yaml
+++ b/charts/core-instance/templates/deployment.yaml
@@ -9,6 +9,8 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/instance: {{ .Values.coreInstance }}
+    app.kubernetes.io/part-of: calyptia
+    calyptia.core: core-instance
 spec:
   replicas: {{ default 1 .Values.replicas }}
   selector:
@@ -23,6 +25,7 @@ spec:
         {{- end }}
       labels:
         app.kubernetes.io/part-of: calyptia
+        calyptia.core: core-instance
     spec:
       serviceAccount: {{ template "instance.serviceAccountName" . }}
       containers:
@@ -80,6 +83,13 @@ spec:
         {{- if .Values.fromCloud.resources }}
         resources: {{- toYaml .Values.fromCloud.resources | nindent 12 }}
         {{- end }}
+        volumeMounts:
+        {{- if .Values.extraVolumeMounts }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
+        {{- end }}
+        {{- if .Values.fromCloud.extraVolumeMounts }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.fromCloud.extraVolumeMounts "context" $) | nindent 12 }}
+        {{- end }}
       - env:
         - name: CORE_INSTANCE
           value: {{ default .Release.Name .Values.coreInstance | quote }}
@@ -121,6 +131,13 @@ spec:
         ports:
           - containerPort: {{ .Values.metricsPort | int }}
             name: metrics
+        volumeMounts:
+        {{- if .Values.extraVolumeMounts }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
+        {{- end }}
+        {{- if .Values.toCloud.extraVolumeMounts }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.toCloud.extraVolumeMounts "context" $) | nindent 12 }}
+        {{- end }}
     {{- if .Values.calyptiaTolerations }}
       tolerations:
       {{- $tolerations := .Values.calyptiaTolerations | split "," }}
@@ -136,4 +153,9 @@ spec:
           {{- end }}
       {{- end }}
     {{- end }}
+      volumes:
+        {{- if .Values.extraVolumes }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
+        {{- end }}
+      restartPolicy: {{ default "Always" .Values.restartPolicy }}
 {{- end }}
diff --git a/charts/core-instance/values.yaml b/charts/core-instance/values.yaml
index fbb2dc8..47ebac3 100644
--- a/charts/core-instance/values.yaml
+++ b/charts/core-instance/values.yaml
@@ -22,12 +22,12 @@ images:
   fromCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-from-cloud
-    tag: 3.2.1
+    tag: 3.3.3
     pullSecrets: []
   toCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-to-cloud
-    tag: 3.2.1
+    tag: 3.3.3
     pullSecrets: []
   hotReload:
     registry: ghcr.io
diff --git a/charts/core-operator/Chart.yaml b/charts/core-operator/Chart.yaml
index 194c208..12148d7 100644
--- a/charts/core-operator/Chart.yaml
+++ b/charts/core-operator/Chart.yaml
@@ -4,8 +4,8 @@ description: Calyptia Core Operator chart
 home: https://calyptia.com/products/core/
 icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
 type: application
-version: 3.2.1
-appVersion: "v3.2.1"
+version: 3.3.3
+appVersion: "v3.3.3"
 maintainers:
   - name: Calyptia
     email: hello@calyptia.com
diff --git a/charts/core-operator/templates/manager.yaml b/charts/core-operator/templates/manager.yaml
index 19d3cc7..1e18122 100644
--- a/charts/core-operator/templates/manager.yaml
+++ b/charts/core-operator/templates/manager.yaml
@@ -42,26 +42,28 @@ spec:
             - /manager
           image: {{ template "operator.image" . }}
           imagePullPolicy: {{ .Values.global.pullPolicy | quote }}
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: 8081
-            initialDelaySeconds: 15
-            periodSeconds: 20
+          volumeMounts:
+          {{- if .Values.extraVolumeMounts }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }}
+          {{- end }}
+          {{- if .Values.startupProbe }}
+          startupProbe: {{- toYaml .Values.startupProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe }}
+          readinessProbe: {{- toYaml .Values.readinessProbe | nindent 12 }}
+          {{- end }}
+          {{- if .Values.livenessProbe }}
+          livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }}
+          {{- end }}
           name: manager
           ports:
             - containerPort: 8443
               name: https
             - containerPort: 8081
               name: http
-          readinessProbe:
-            httpGet:
-              path: /readyz
-              port: 8081
-            initialDelaySeconds: 5
-            periodSeconds: 10
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+          {{- if .Values.resources }}
+          resources: {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:
@@ -72,4 +74,10 @@ spec:
       serviceAccount: {{ template "operator.serviceAccountName" . }}
       {{- include "operator.imagePullSecrets" . | nindent 6 }}
       terminationGracePeriodSeconds: 10
+      volumes:
+        {{- if .Values.extraVolumes }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }}
+        {{- end }}
+      restartPolicy: {{ default "Always" .Values.restartPolicy }}
+
 {{- end }}
diff --git a/charts/core-operator/values.yaml b/charts/core-operator/values.yaml
index 5f60854..0b87ac2 100644
--- a/charts/core-operator/values.yaml
+++ b/charts/core-operator/values.yaml
@@ -4,7 +4,7 @@ images:
   operator:
     registry: ghcr.io
     repository: calyptia/core-operator
-    tag: 3.2.1
+    tag: 3.3.3
     pullSecrets: []
   hotReload:
     registry: ghcr.io
@@ -64,3 +64,16 @@ resources:
   requests:
     cpu: 10m
     memory: 64Mi
+readinessProbe:
+  httpGet:
+    path: /readyz
+    port: 8081
+  initialDelaySeconds: 5
+  periodSeconds: 10
+livenessProbe:
+  httpGet:
+    path: /healthz
+    port: 8081
+  initialDelaySeconds: 15
+  periodSeconds: 20
+restartPolicy: Always