diff --git a/charts/konnector/Chart.yaml b/charts/konnector/Chart.yaml
index e6b5d08..d80a4c7 100644
--- a/charts/konnector/Chart.yaml
+++ b/charts/konnector/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: konnector
 description: Deploys Palo Alto Networks' Cortex KSPM connector for advanced Kubernetes security posture management.
 type: application
-version: 1.0.24-rc.6
+version: 1.0.24-rc.7
 appVersion: "1.0.0"
 maintainers:
   - name: Palo Alto Networks - Cortex KSPM team
diff --git a/charts/konnector/templates/_helpers.tpl b/charts/konnector/templates/_helpers.tpl
index 84b996f..c7381d2 100644
--- a/charts/konnector/templates/_helpers.tpl
+++ b/charts/konnector/templates/_helpers.tpl
@@ -70,11 +70,11 @@ spec:
             secretName: {{ .Values.system.secrets.backendAuth.name }}
       serviceAccountName: {{ .Values.system.serviceAccount.name }}
       containers:
-        - name: {{ .Chart.Name }}
+        - name: {{ .Values.system.batch.name }}
           image: "{{ .Values.image.repository }}/{{ .Values.image.name }}{{- if .Values.image.tag }}:{{ .Values.image.tag }}{{- end }}{{- if .Values.image.digest }}@{{ .Values.image.digest }}{{- end }}"
           resources:
             {{- toYaml .Values.system.apps.resources | nindent 12 }}
-          command: [/{{ .Chart.Name }}]
+          command: [/konnector]
           env:
             - name: NAMESPACE
               valueFrom:
diff --git a/charts/konnector/templates/batch.yaml b/charts/konnector/templates/batch.yaml
index ed7a8c0..335d448 100644
--- a/charts/konnector/templates/batch.yaml
+++ b/charts/konnector/templates/batch.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: "{{ .Chart.Name }}-job-revision-{{ .Release.Revision }}"
+  name: "{{ .Values.system.batch.name }}-job-revision-{{ .Release.Revision }}"
   namespace: {{ .Values.namespace.name }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
@@ -13,7 +13,7 @@ metadata:
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: {{ .Chart.Name }}
+  name: {{ .Values.system.batch.name }}
   namespace: {{ .Values.namespace.name }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
@@ -26,7 +26,7 @@ spec:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: delete-{{ .Values.system.K8sManager.ReleaseName }}
+  name: delete-{{ .Values.system.batch.name }}
   namespace: {{ .Values.namespace.name }}
   annotations:
     "helm.sh/hook": pre-delete
diff --git a/charts/konnector/values.yaml b/charts/konnector/values.yaml
index dda4208..0f644d6 100644
--- a/charts/konnector/values.yaml
+++ b/charts/konnector/values.yaml
@@ -63,6 +63,7 @@ system:
   batch:
     backoffLimit: 4  # Maximum number of retries before the job is considered failed. After 4 attempts, the job will fail.
     ttlSecondsAfterFinished: 3600  # Time-to-live for completed jobs, jobs will be automatically deleted 3600 seconds (1 hour) after completion
+    name: "cortex-syncer"
     cleanupJob:
       resources:
         requests: