Rename service directory
Define explicit tag for the docker base image