Changes to the bootstrapping to extract the Amazon credentials correctly