Refactor apache image