make production variables more generic