jenkins_integration: refactoring