diff --git a/.gitignore b/.gitignore
index 68ec9fcf5..e99f800fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 /machine*
 /bin
 .vagrant
-*_etcd_data
+*.etcd
 /etcd
 *.swp
 /hack/insta-discovery/.env
diff --git a/main.go b/main.go
index 96c42fc33..4445bb2e7 100644
--- a/main.go
+++ b/main.go
@@ -146,7 +146,7 @@ func startEtcd() {
 	}
 
 	if *dir == "" {
-		*dir = fmt.Sprintf("%v_etcd_data", *name)
+		*dir = fmt.Sprintf("%v.etcd", *name)
 		log.Printf("etcd: no data-dir provided, using default data-dir ./%s", *dir)
 	}
 	if err := os.MkdirAll(*dir, privateDirMode); err != nil {