diff --git a/commands.go b/commands.go
index 7fabc9d0f8..a16676b424 100644
--- a/commands.go
+++ b/commands.go
@@ -407,20 +407,20 @@ func cmdCreate(c *cli.Context) {
 
 	hostConfig := &libmachine.HostOptions{
 		AuthConfig: &auth.AuthOptions{
-			CaCertPath:     c.GlobalString("tls-ca-cert"),
-			PrivateKeyPath: c.GlobalString("tls-ca-key"),
-			ClientCertPath: c.GlobalString("tls-client-cert"),
-			ClientKeyPath:  filepath.Join(utils.GetMachineCertDir(), "key.pem"),
+			CaCertPath:     certInfo.CaCertPath,
+			PrivateKeyPath: certInfo.CaKeyPath,
+			ClientCertPath: certInfo.ClientCertPath,
+			ClientKeyPath:  certInfo.ClientKeyPath,
 			ServerCertPath: filepath.Join(utils.GetMachineDir(), name, "server.pem"),
 			ServerKeyPath:  filepath.Join(utils.GetMachineDir(), name, "server-key.pem"),
 		},
 		EngineConfig: &engine.EngineOptions{},
 		SwarmConfig: &swarm.SwarmOptions{
 			IsSwarm:   c.Bool("swarm"),
-			Master:    c.GlobalBool("swarm-master"),
-			Discovery: c.GlobalString("swarm-discovery"),
-			Address:   c.GlobalString("swarm-addr"),
-			Host:      c.GlobalString("swarm-host"),
+			Master:    c.Bool("swarm-master"),
+			Discovery: c.String("swarm-discovery"),
+			Address:   c.String("swarm-addr"),
+			Host:      c.String("swarm-host"),
 		},
 	}
 
diff --git a/libmachine/filestore.go b/libmachine/filestore.go
index 1ca6b6cca9..fefacd4332 100644
--- a/libmachine/filestore.go
+++ b/libmachine/filestore.go
@@ -153,12 +153,12 @@ func (s Filestore) activePath() string {
 // validates host config and modifies if needed
 // this is used for configuration updates
 func validateHost(host *Host) *Host {
-	if host.EngineOptions == nil {
-		host.EngineOptions = &engine.EngineOptions{}
+	if host.HostConfig.EngineConfig == nil {
+		host.HostConfig.EngineConfig = &engine.EngineOptions{}
 	}
 
-	if host.SwarmOptions == nil {
-		host.SwarmOptions = &swarm.SwarmOptions{
+	if host.HostConfig.SwarmConfig == nil {
+		host.HostConfig.SwarmConfig = &swarm.SwarmOptions{
 			Address:   "",
 			Discovery: host.SwarmDiscovery,
 			Host:      host.SwarmHost,
diff --git a/libmachine/host.go b/libmachine/host.go
index 20c1e1d21d..529f77e583 100644
--- a/libmachine/host.go
+++ b/libmachine/host.go
@@ -26,13 +26,11 @@ var (
 )
 
 type Host struct {
-	Name          string `json:"-"`
-	DriverName    string
-	Driver        drivers.Driver
-	StorePath     string
-	EngineOptions *engine.EngineOptions
-	SwarmOptions  *swarm.SwarmOptions
-	HostConfig    HostOptions
+	Name       string `json:"-"`
+	DriverName string
+	Driver     drivers.Driver
+	StorePath  string
+	HostConfig HostOptions
 
 	// deprecated options; these are left to assist in config migrations
 	SwarmHost      string