WIP - fixes port mapping and naming issues in DockerTemplate