diff --git a/etc/nodes.conf b/etc/nodes.conf
index 3a8c4bb9..d9d094cb 100644
--- a/etc/nodes.conf
+++ b/etc/nodes.conf
@@ -2,54 +2,11 @@ nodeprofiles:
   default:
     comment: "Hello from the default profile"
     vnfs: ""
-    kernel version: "blahblah"
+    kernel version: ""
     kernel args: crashkernel=no quiet
-    network devices:
-      eth0:
-        type: ethernet
-        netmask: 255.255.255.0
-        gateway: 192.168.1.1
-        ipaddr: 192.168.1.99
-  test:
-    comment: "Test profile"
-
-control:
-  localhost:
-    comment: This is the first control system
-    ipaddr: 192.168.1.1
-    services:
-      warewulfd:
-        port: 9873
-        secure: true
-      dhcp:
-        enabled: true
-        range start: 192.168.1.100
-        range end: 192.168.1.250
-        assign static: false
-        config file: /etc/dhcp/dhcpd.conf
-        start command: systemctl start dhcpd
-        restart command: systemctl restart dhcpd
-        enable command: systemctl enable dhcpd
-      tftp:
-        enabled: true
-        tftproot: /var/lib/tftproot
-        start command: service tftp start
-        restart command: service tftp restart
-        enable command: chkconfig tftp on
-      nfs:
-        enabled: true
-        config file: /etc/exports
-        exports:
-        - /var/warewulf 192.168.1.1/255.255.255.0(ro,no_root_squash)
-        - /home 192.168.1.1/255.255.255.0(rw,no_root_squash)
-        start command: service nfs start
-        restart command: service nfs restart
-        enable command: chkconfig nfs on
 
 nodes:
   n0000.cluster01:
-    profiles:
-    - default
     network devices:
       eth0:
         type: ethernet
@@ -62,9 +19,6 @@ nodes:
         ipaddr: 192.168.10.100
         netmask: 255.255.255.0
   n0001.cluster01:
-    profiles:
-    - default
-    - test
     network devices:
       eth0:
         hwaddr: aa:bb:cc:dd:ee:b0
diff --git a/etc/warewulf.conf b/etc/warewulf.conf
index ae205e82..1f10ceec 100644
--- a/etc/warewulf.conf
+++ b/etc/warewulf.conf
@@ -1,4 +1,11 @@
-warewulfd ipaddr: 192.168.1.1
-warewulfd port: 9873
-insecure runtime: false
-debug: false
+ipaddr: 192.168.1.1
+netmask: 255.255.255.0
+warewulf:
+  port: 9873
+  secure: true
+dhcp:
+  enabled: true
+  range start: 192.168.1.150
+  range end: 192.168.1.200
+  template: default
+