diff --git a/initialize/etcd.go b/initialize/etcd.go
index a55be07..ad93cb6 100644
--- a/initialize/etcd.go
+++ b/initialize/etcd.go
@@ -31,11 +31,18 @@ func (ec EtcdEnvironment) String() (out string) {
 
 		out += fmt.Sprintf("Environment=\"ETCD_%s=%s\"\n", key, val)
 	}
+
 	return
 }
 
 // Write an EtcdEnvironment to the appropriate path on disk for etcd.service
 func WriteEtcdEnvironment(env EtcdEnvironment, root string) error {
+	if _, ok := env["name"]; !ok {
+		if name := system.MachineID(root); name != "" {
+			env["name"] = name
+		}
+	}
+
 	file := system.File{
 		Path: path.Join(root, "run", "systemd", "system", "etcd.service.d", "20-cloudinit.conf"),
 		RawFilePermissions: "0644",
diff --git a/initialize/etcd_test.go b/initialize/etcd_test.go
index f1c3e94..56cd88c 100644
--- a/initialize/etcd_test.go
+++ b/initialize/etcd_test.go
@@ -46,6 +46,7 @@ Environment="ETCD_PEER_BIND_ADDR=192.0.2.13:7001"
 
 func TestEtcdEnvironmentWrittenToDisk(t *testing.T) {
 	ec := EtcdEnvironment{
+		"name": "node001",
 		"discovery_url": "http://disco.example.com/foobar",
 		"peer-bind-addr": "127.0.0.1:7002",
 	}
@@ -76,6 +77,7 @@ func TestEtcdEnvironmentWrittenToDisk(t *testing.T) {
 	}
 
 	expect := `[Service]
+Environment="ETCD_NAME=node001"
 Environment="ETCD_DISCOVERY_URL=http://disco.example.com/foobar"
 Environment="ETCD_PEER_BIND_ADDR=127.0.0.1:7002"
 `
@@ -84,6 +86,48 @@ Environment="ETCD_PEER_BIND_ADDR=127.0.0.1:7002"
 	}
 }
 
+func TestEtcdEnvironmentWrittenToDiskDefaults(t *testing.T) {
+	ec := EtcdEnvironment{}
+	dir, err := ioutil.TempDir(os.TempDir(), "coreos-cloudinit-")
+	if err != nil {
+		t.Fatalf("Unable to create tempdir: %v", err)
+	}
+	defer syscall.Rmdir(dir)
+
+	os.Mkdir(path.Join(dir, "etc"), os.FileMode(0755))
+	err = ioutil.WriteFile(path.Join(dir, "etc", "machine-id"), []byte("node007"), os.FileMode(0444))
+	if err != nil {
+		t.Fatalf("Failed writing out /etc/machine-id: %v", err)
+	}
+
+	if err := WriteEtcdEnvironment(ec, dir); err != nil {
+		t.Fatalf("Processing of EtcdEnvironment failed: %v", err)
+	}
+
+	fullPath := path.Join(dir, "etc", "systemd", "system", "etcd.service.d", "20-cloudinit.conf")
+
+	fi, err := os.Stat(fullPath)
+	if err != nil {
+		t.Fatalf("Unable to stat file: %v", err)
+	}
+
+	if fi.Mode() != os.FileMode(0644) {
+		t.Errorf("File has incorrect mode: %v", fi.Mode())
+	}
+
+	contents, err := ioutil.ReadFile(fullPath)
+	if err != nil {
+		t.Fatalf("Unable to read expected file: %v", err)
+	}
+
+	expect := `[Service]
+Environment="ETCD_NAME=node007"
+`
+	if string(contents) != expect {
+		t.Fatalf("File has incorrect contents")
+	}
+}
+
 func rmdir(path string) error {
     cmd := exec.Command("rm", "-rf", path)
     return cmd.Run()
diff --git a/system/systemd.go b/system/systemd.go
index 5861238..5b77f9f 100644
--- a/system/systemd.go
+++ b/system/systemd.go
@@ -2,6 +2,7 @@ package system
 
 import (
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -161,3 +162,8 @@ func ExecuteScript(scriptPath string) (string, error) {
 func SetHostname(hostname string) error {
 	return exec.Command("hostnamectl", "set-hostname", hostname).Run()
 }
+
+func MachineID(root string) string {
+	contents, _ := ioutil.ReadFile(path.Join(root, "etc", "machine-id"))
+	return strings.TrimSpace(string(contents))
+}
diff --git a/system/systemd_test.go b/system/systemd_test.go
index 02924b0..6635d0e 100644
--- a/system/systemd_test.go
+++ b/system/systemd_test.go
@@ -100,3 +100,17 @@ Where=/media/state
 	}
 }
 
+func TestMachineID(t *testing.T) {
+	dir, err := ioutil.TempDir(os.TempDir(), "coreos-cloudinit-")
+	if err != nil {
+		t.Fatalf("Unable to create tempdir: %v", err)
+	}
+	defer syscall.Rmdir(dir)
+
+	os.Mkdir(path.Join(dir, "etc"), os.FileMode(0755))
+	ioutil.WriteFile(path.Join(dir, "etc", "machine-id"), []byte("node007\n"), os.FileMode(0444))
+
+	if MachineID(dir) != "node007" {
+		t.Fatalf("File has incorrect contents")
+	}
+}
diff --git a/test.yaml b/test.yaml
index 8941ecd..cbf0170 100644
--- a/test.yaml
+++ b/test.yaml
@@ -4,4 +4,3 @@ coreos:
     etcd:
         discovery_url: https://discovery.etcd.io/0022cb5027f8f5167a874794c3a13e0d
         bind-addr: $public_ipv4:4001
-        name: polvi