refactoring for openshift deployment