Refactoring of archive creation

2 jobs for master in 52 seconds (queued for 6 seconds)