GROOVY-6268: Refactored common variables into the options map
   * introduced reusable variables
   * fix includes