diff --git a/charts/offlineimap/Chart.yaml b/charts/offlineimap/Chart.yaml
index 0bbf7fd..f1c77c2 100644
--- a/charts/offlineimap/Chart.yaml
+++ b/charts/offlineimap/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 description: Helm chart for offlineimap
 name: offlineimap
 type: application
-version: 0.0.3
+version: 0.0.4
 kubeVersion: ">=1.16.0-0"
 keywords:
 - offlineimap
diff --git a/charts/offlineimap/templates/cronjob.yaml b/charts/offlineimap/templates/cronjob.yaml
index 5309111..1af2e26 100644
--- a/charts/offlineimap/templates/cronjob.yaml
+++ b/charts/offlineimap/templates/cronjob.yaml
@@ -24,9 +24,50 @@ spec:
       template:
         spec:
           containers:
-          {{- include "common.controller.mainContainer" . | nindent 2 }}
-        {{- with (include "common.controller.volumes" . | trim) }}
-        volumes:
-          {{- nindent 2 . }}
-        {{- end }}
+          - name: {{ include "common.names.fullname" . }}
+            image: {{ printf "%s:%s" .Values.image.repository (default .Chart.AppVersion .Values.image.tag) | quote }}
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
+            {{- with .Values.env }}
+            env:
+              {{- range $k, $v := . }}
+                {{- $name := $k }}
+                {{- $value := $v }}
+                {{- if kindIs "int" $name }}
+                  {{- $name = required "environment variables as a list of maps require a name field" $value.name }}
+                {{- end }}
+              - name: {{ quote $name }}
+                {{- if kindIs "map" $value -}}
+                  {{- if hasKey $value "value" }}
+                      {{- $value = $value.value -}}
+                  {{- else if hasKey $value "valueFrom" }}
+                    {{- toYaml $value | nindent 6 }}
+                  {{- else }}
+                    {{- dict "valueFrom" $value | toYaml | nindent 6 }}
+                  {{- end }}
+                {{- end }}
+                {{- if not (kindIs "map" $value) }}
+                  {{- if kindIs "string" $value }}
+                    {{- $value = tpl $value $ }}
+                  {{- end }}
+                value: {{ quote $value }}
+                {{- end }}
+              {{- end }}
+            {{- end }}
+            envFrom:
+              {{- with .Values.envFrom }}
+                {{- toYaml . | nindent 4 }}
+              {{- end }}
+              {{- if .Values.secret }}
+              - secretRef:
+                  name: {{ include "common.names.fullname" . }}
+              {{- end }}
+            {{- end }}
+            {{- with (include "common.controller.volumeMounts" . | trim) }}
+            volumeMounts:
+              {{- nindent 4 . }}
+            {{- end }}
+          {{- with (include "common.controller.volumes" . | trim) }}
+          volumes:
+            {{- nindent 2 . }}
+          {{- end }}
 {{- end }}