Improvements for deployment and sidekiq