diff --git a/galaxy/templates/cronjob-maintenance.yaml b/galaxy/templates/cronjob-maintenance.yaml
index 3f626e35..3932f35d 100644
--- a/galaxy/templates/cronjob-maintenance.yaml
+++ b/galaxy/templates/cronjob-maintenance.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: {{ include "galaxy.fullname" $ }}-maintenance-{{ $key }}
+  name: {{ include "galaxy.fullname" $ }}-cron-{{ $key }}
   labels:
     {{- include "galaxy.labels" $ | nindent 4 }}
 spec:
@@ -21,7 +21,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           containers:
-          - name: galaxy-maintenance-{{ $key }}
+          - name: galaxy-cron-{{ $key }}
             image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag }}"
             imagePullPolicy: {{ $.Values.image.pullPolicy }}
             command:
diff --git a/galaxy/values.yaml b/galaxy/values.yaml
index 454215eb..a049f74d 100644
--- a/galaxy/values.yaml
+++ b/galaxy/values.yaml
@@ -282,7 +282,7 @@ cronJobs:
   maintenance:
     schedule: "5 2 * * *"
     extraSettings:
-      days: 7
+      days: '7'
     securityContext:
       runAsUser: 0
     command:
@@ -292,12 +292,12 @@ cronJobs:
       - "/galaxy/server/scripts/maintenance.sh"
       - "--no-dry-run"
       - "--days"
-      - "{{ .Values.cronJobs.maintenance.extraSettings.days }}"
+      - "{{ tpl .Values.cronJobs.maintenance.extraSettings.days $ }}"
   #- Remove files from the tmp directory that are older than the allowable wall time for a job
-  tmp:
+  tmpdir:
     schedule: "15 2 * * *"
     extraSettings:
-      seconds: 604800
+      days: '{{ div (index .Values "configs" "job_conf.yml" "runners" "k8s" "k8s_walltime_limit" | default 604800) 7 }}'
     securityContext:
       runAsUser: 0
     command:
@@ -306,7 +306,7 @@ cronJobs:
       - "{{ .Values.persistence.mountPath }}/tmp"
       - "!"
       - "-newermt"
-      - "{{ .Values.cronJobs.tmp.extraSettings.seconds }}"
+      - "{{ tpl .Values.cronJobs.tmpdir.extraSettings.days $ }}"
       - "seconds"
       - "-type"
       - "f"