Reduce the number of layers required to build the image. There is a limit of 127 layers.
Updated Systemd unit file to use the tag from the upcoming release.