diff --git a/data/cloud/node1-cloud.yml b/data/cloud/node1.yml
similarity index 85%
rename from data/cloud/node1-cloud.yml
rename to data/cloud/node1.yml
index f407240e..886efcc4 100644
--- a/data/cloud/node1-cloud.yml
+++ b/data/cloud/node1.yml
@@ -10,4 +10,4 @@ write_files:
     owner: "core"
     permissions: "0644"
     content: |
-      File added by node1-cloud.yml.
+      File added by node1.yml.
diff --git a/data/cloud/node2.yml b/data/cloud/node2.yml
new file mode 100644
index 00000000..62b52d7a
--- /dev/null
+++ b/data/cloud/node2.yml
@@ -0,0 +1,13 @@
+#cloud-config
+coreos:
+  units:
+    - name: etcd2.service
+      command: start
+    - name: fleet.service
+      command: start
+write_files:
+  - path: "/home/core/cloud"
+    owner: "core"
+    permissions: "0644"
+    content: |
+      File added by node2.yml.
diff --git a/data/ignition/node1.json b/data/ignition/node1.json
new file mode 100644
index 00000000..e5807401
--- /dev/null
+++ b/data/ignition/node1.json
@@ -0,0 +1,11 @@
+{
+    "ignitionVersion": 1,
+    "networkd": {
+        "units": [
+            {
+                "name": "00-ens3.network",
+                "contents": "[Match]\nName=ens3\n\n[Network]\nAddress=172.17.0.41"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/data/ignition/node2.json b/data/ignition/node2.json
new file mode 100644
index 00000000..b8831633
--- /dev/null
+++ b/data/ignition/node2.json
@@ -0,0 +1,20 @@
+{
+    "ignitionVersion": 1,
+    "systemd": {
+        "units": [
+            {
+                "name": "hello.service",
+                "enable": true,
+                "contents": "[Service]\nType=oneshot\nExecStart=/usr/bin/echo Hello World\n\n[Install]\nWantedBy=multi-user.target"
+            }
+        ]
+    },
+    "networkd": {
+        "units": [
+            {
+                "name": "00-ens3.network",
+                "contents": "[Match]\nName=ens3\n\n[Network]\nAddress=172.17.0.42"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/data/machines/074fbe06-94a9-4336-9e8a-20b6f81efb6c/machine.json b/data/machines/074fbe06-94a9-4336-9e8a-20b6f81efb6c/machine.json
index ccd311ea..f857da98 100644
--- a/data/machines/074fbe06-94a9-4336-9e8a-20b6f81efb6c/machine.json
+++ b/data/machines/074fbe06-94a9-4336-9e8a-20b6f81efb6c/machine.json
@@ -1,4 +1,18 @@
 {
     "id": "074fbe06-94a9-4336-9e8a-20b6f81efb6c",
-    "spec_id": "orion"
+    "spec": {
+      "boot": {
+          "kernel": "/images/coreos/835.9.0/coreos_production_pxe.vmlinuz",
+          "initrd": ["/images/coreos/835.9.0/coreos_production_pxe_image.cpio.gz"],
+          "cmdline": {
+              "cloud-config-url": "http://172.17.0.2:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}",
+              "coreos.config.url": "http://172.17.0.2:8080/ignition?uuid=${uuid}",
+              "coreos.autologin": "",
+              "coreos.first_boot": ""
+          }
+      },
+      "cloud_id": "node2.yml",
+      "ignition_id": "node2.json"
+    },
+    "spec_id": ""
 }
diff --git a/data/machines/2d9354a2-e8db-4021-bff5-20ffdf443d6f/machine.json b/data/machines/2d9354a2-e8db-4021-bff5-20ffdf443d6f/machine.json
index 9c07bcca..bf04c283 100644
--- a/data/machines/2d9354a2-e8db-4021-bff5-20ffdf443d6f/machine.json
+++ b/data/machines/2d9354a2-e8db-4021-bff5-20ffdf443d6f/machine.json
@@ -2,15 +2,17 @@
     "id": "2d9354a2-e8db-4021-bff5-20ffdf443d6f",
     "spec": {
       "boot": {
-          "kernel": "/images/coreos/877.1.0/coreos_production_pxe.vmlinuz",
-          "initrd": ["/images/coreos/877.1.0/coreos_production_pxe_image.cpio.gz"],
+          "kernel": "/images/coreos/835.9.0/coreos_production_pxe.vmlinuz",
+          "initrd": ["/images/coreos/835.9.0/coreos_production_pxe_image.cpio.gz"],
           "cmdline": {
               "cloud-config-url": "http://172.17.0.2:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}",
-              "coreos.autologin": ""
+              "coreos.config.url": "http://172.17.0.2:8080/ignition?uuid=${uuid}",
+              "coreos.autologin": "",
+              "coreos.first_boot": ""
           }
       },
-      "cloud_id": "node1-cloud.yml",
-      "ignition_id": ""
+      "cloud_id": "node1.yml",
+      "ignition_id": "node1.json"
     },
     "spec_id": ""
 }
diff --git a/data/specs/orion/spec.json b/data/specs/orion/spec.json
index 3b59c24e..e9f52405 100644
--- a/data/specs/orion/spec.json
+++ b/data/specs/orion/spec.json
@@ -5,7 +5,9 @@
         "initrd": ["/images/coreos/835.9.0/coreos_production_pxe_image.cpio.gz"],
         "cmdline": {
             "cloud-config-url": "http://172.17.0.2:8080/cloud?uuid=${uuid}&mac=${net0/mac:hexhyp}",
-            "coreos.autologin": ""
+            "coreos.config.url": "http://172.17.0.2:8080/ignition?uuid=${uuid}",
+            "coreos.autologin": "",
+            "coreos.first_boot": ""
         }
     },
     "cloud_id": "orion-cloud-config.yml",