rollback previous 2 commits due to it is not complete
fix env settings for production and developemnt