diff --git a/cmd/control/console_init.go b/cmd/control/console_init.go
index 12d42c1d..0a4ea41c 100644
--- a/cmd/control/console_init.go
+++ b/cmd/control/console_init.go
@@ -81,7 +81,7 @@ func consoleInitFunc() error {
 		log.Error(err)
 	}
 
-	if err := writeRespawn("rancher", true, false); err != nil {
+	if err := writeRespawn("rancher", cfg.Rancher.SSH.Daemon, false); err != nil {
 		log.Error(err)
 	}
 
diff --git a/config/schema.go b/config/schema.go
index 982c02de..5d0bd2b5 100644
--- a/config/schema.go
+++ b/config/schema.go
@@ -146,7 +146,7 @@ var schema = `{
 
       "properties": {
         "keys": {"type": "object"},
-        "disable": {"type": "boolean"}
+        "daemon": {"type": "boolean"}
       }
     },
 
diff --git a/config/types.go b/config/types.go
index 9cd778ab..9b7c41cb 100755
--- a/config/types.go
+++ b/config/types.go
@@ -175,8 +175,8 @@ type DockerConfig struct {
 }
 
 type SSHConfig struct {
-	Keys    map[string]string `yaml:"keys,omitempty"`
-	Disable bool              `yaml:"disable,omitempty"`
+	Keys   map[string]string `yaml:"keys,omitempty"`
+	Daemon bool              `yaml:"daemon,omitempty"`
 }
 
 type StateConfig struct {
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index eece9d67..5c7c4a64 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -14,6 +14,8 @@ rancher:
     network:
       dns:
         nameservers: [8.8.8.8, 8.8.4.4]
+  ssh:
+    daemon: true
   bootstrap:
     bootstrap:
       image: {{.OS_REPO}}/os-bootstrap:{{.VERSION}}{{.SUFFIX}}
diff --git a/scripts/schema.json b/scripts/schema.json
index 4262b9db..8f11bb6d 100644
--- a/scripts/schema.json
+++ b/scripts/schema.json
@@ -144,7 +144,7 @@
 
       "properties": {
         "keys": {"type": "object"},
-        "disable": {"type": "boolean"}
+        "daemon": {"type": "boolean"}
       }
     },