DJBP-8 | proper prod settings: refactoring