Refactor to use d11wtq/apache base image