diff --git a/library/common/1.0.0/templates/spawner/_jobAndCronJob.tpl b/library/common/1.0.0/templates/spawner/_jobAndCronJob.tpl
index 2c0e197944..16e2162ffd 100644
--- a/library/common/1.0.0/templates/spawner/_jobAndCronJob.tpl
+++ b/library/common/1.0.0/templates/spawner/_jobAndCronJob.tpl
@@ -24,7 +24,9 @@
       {{- end -}}
     {{- end -}}
 
-    {{/* Add the .Values as the main container */}}
+    {{/* Add the .Values as the main container and as pod */}}
+    {{/* This needs some redesign tbh */}}
+    {{- $_ := set $jobValues "podSpec" .Values -}}
     {{- $_ := set $jobValues.podSpec "containers" dict -}}
     {{- $_ := set $jobValues.podSpec.containers "main" .Values -}}
     {{- $_ := set $jobValues.podSpec.containers.main "enabled" "true" -}}