diff --git a/cluster/images/etcd/migrate-if-needed.sh b/cluster/images/etcd/migrate-if-needed.sh
index 23752ccaa4a..12a7a5ec6fe 100755
--- a/cluster/images/etcd/migrate-if-needed.sh
+++ b/cluster/images/etcd/migrate-if-needed.sh
@@ -101,12 +101,12 @@ fi
 start_etcd() {
   # Use random ports, so that apiserver cannot connect to etcd.
   ETCD_PORT=18629
-  ETCD_PEER_PORT=18630
+  ETCD_PEER_PORT=2380
   # Avoid collisions between etcd and event-etcd.
   case "${DATA_DIRECTORY}" in
     *event*)
       ETCD_PORT=18631
-      ETCD_PEER_PORT=18632
+      ETCD_PEER_PORT=2381
       ;;
   esac
   local ETCD_CMD="${ETCD:-/usr/local/bin/etcd-${START_VERSION}}"
@@ -117,7 +117,8 @@ start_etcd() {
   else
     ETCDCTL_CMD="${ETCDCTL_CMD} --endpoints=http://127.0.0.1:${ETCD_PORT} put"
   fi
-  ${ETCD_CMD} --data-dir=${DATA_DIRECTORY} \
+  ${ETCD_CMD} --name="etcd-$(hostname)" \
+    --data-dir=${DATA_DIRECTORY} \
     --listen-client-urls http://127.0.0.1:${ETCD_PORT} \
     --advertise-client-urls http://127.0.0.1:${ETCD_PORT} \
     --listen-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \