diff --git a/cockroachdb/templates/job.init.yaml b/cockroachdb/templates/job.init.yaml
index dbc1eaa1..d3226c45 100644
--- a/cockroachdb/templates/job.init.yaml
+++ b/cockroachdb/templates/job.init.yaml
@@ -19,12 +19,17 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   annotations:
-    helm.sh/hook: post-install,post-upgrade
+    {{- if not .Release.IsInstall }}
+    helm.sh/hook: post-upgrade
     helm.sh/hook-delete-policy: before-hook-creation
+    {{- end }}
     {{- with .Values.init.jobAnnotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
+  {{- if .Release.IsInstall }}
+  ttlSecondsAfterFinished: 0
+  {{- end }}
   template:
     metadata:
       labels: