Integrated the etcd-service with the images. Need to test yet.