Make settings changes to allow for staging branch usage in the future