Extract etcd correctly