Refactor the job.conf.erb and the jod.pp files