Improve gemfile handling and different jobs