Reworking settings into dev and prod