diff --git a/main.go b/main.go
index 11cc9a7815..32fe9b51ee 100644
--- a/main.go
+++ b/main.go
@@ -39,7 +39,7 @@ func main() {
 		cli.StringFlag{
 			EnvVar: "MACHINE_STORAGE_PATH",
 			Name:   "storage-path",
-			Value:  utils.GetBaseDir(),
+			Value:  utils.GetMachineRoot(),
 			Usage:  "Configures storage path",
 		},
 		cli.StringFlag{
diff --git a/utils/utils.go b/utils/utils.go
index fe20674f46..d63e05052e 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -22,7 +22,7 @@ func GetHomeDir() string {
 func GetBaseDir() string {
 	baseDir := os.Getenv("MACHINE_STORAGE_PATH")
 	if baseDir == "" {
-		baseDir = filepath.Join(GetHomeDir(), ".docker", "machine")
+		baseDir = filepath.Join(GetHomeDir(), ".docker")
 	}
 	return baseDir
 }
@@ -31,16 +31,20 @@ func GetDockerDir() string {
 	return filepath.Join(GetHomeDir(), ".docker")
 }
 
+func GetMachineRoot() string {
+	return filepath.Join(GetBaseDir(), "machine")
+}
+
 func GetMachineDir() string {
-	return filepath.Join(GetBaseDir(), "machines")
+	return filepath.Join(GetMachineRoot(), "machines")
 }
 
 func GetMachineCertDir() string {
-	return filepath.Join(GetBaseDir(), "certs")
+	return filepath.Join(GetMachineRoot(), "certs")
 }
 
 func GetMachineCacheDir() string {
-	return filepath.Join(GetBaseDir(), "cache")
+	return filepath.Join(GetMachineRoot(), "cache")
 }
 
 func GetUsername() string {