diff --git a/charts/cronjob/Chart.yaml b/charts/cronjob/Chart.yaml
index 7422c32..85eabc4 100644
--- a/charts/cronjob/Chart.yaml
+++ b/charts/cronjob/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: cronjob
 description: A chart for CronJobs.
 icon: https://contino.github.io/intro-k8/images/kubernetes/cronjob.png
-version: 2.0.4
-appVersion: 2.0.4
+version: 2.0.5
+appVersion: 2.0.5
 type: application
 keywords:
   - cronjob
diff --git a/charts/cronjob/templates/cronjob.yaml b/charts/cronjob/templates/cronjob.yaml
index e8ad41f..325711b 100644
--- a/charts/cronjob/templates/cronjob.yaml
+++ b/charts/cronjob/templates/cronjob.yaml
@@ -28,9 +28,9 @@ metadata:
   {{- end }}
 spec:
   schedule: {{ .schedule | quote }}
-  concurrencyPolicy: {{ .concurrencyPolicy | quote }}
-  successfulJobsHistoryLimit: {{ default "0" .successfulJobsHistoryLimit }}
-  failedJobsHistoryLimit: {{ default "0" .failedJobsHistoryLimit }}
+  concurrencyPolicy: {{ .concurrencyPolicy | default "Replace" | quote }}
+  successfulJobsHistoryLimit: {{ .successfulJobsHistoryLimit | default "2" }}
+  failedJobsHistoryLimit: {{ .failedJobsHistoryLimit | default "2" }}
   jobTemplate:
     spec:
       template:
diff --git a/charts/cronjob/values.yaml b/charts/cronjob/values.yaml
index 4755966..e9835a0 100644
--- a/charts/cronjob/values.yaml
+++ b/charts/cronjob/values.yaml
@@ -118,8 +118,8 @@ cronjobs:
       - sh
       - -c
       - "date; echo Hello"
-    successfulJobsHistoryLimit: 0
-    failedJobsHistoryLimit: 0
+    successfulJobsHistoryLimit: 2
+    failedJobsHistoryLimit: 2
     concurrencyPolicy: "Replace"
 
 ## Vault settings for secrets