change config on env
Merge branch 'issue-change-config-on-env'