Breaking etcd stuff into two scripts per feedback