Moving ADD commands at the end so if something in the config change, it can reuse all previous cached steps