diff --git a/onlab.yml b/onlab.yml
index f9bcf34..23ea894 100644
--- a/onlab.yml
+++ b/onlab.yml
@@ -13,65 +13,65 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-# Deployment configuration for a physical hardware POD
 ---
 
-# this is used to generate the genconfig/cord-inv file
-headnode:
-  ip: '10.90.0.251'
-  ansible_user: 'cord'
-  ansible_ssh_pass: 'cord'
-  ansible_ssh_port: 22
+cord_scenario: cord
+cord_profile: rcord
 
-common:
+vagrant_vms:
+  - 'corddev'
 
-  # set to the profile of cord you want to install
-  cord_profile: 'rcord'
+# Variables
+credentials_dir: '/opt/credentials'
+pki_dir: '/opt/pki'
+ssh_pki_dir: '/opt/ssh_pki'
 
-  # cord dir is shared to corddev VM, causing permissions issues if these aren't set
-  credentials_dir: '/opt/credentials'
-  pki_dir: '/opt/pki'
-  ssh_pki_dir: '/opt/ssh_pki'
+fabric_ip: '10.6.1.1/24'
+management_ip: '10.6.0.1/24'
+external_ip: '10.90.0.251/24'
+external_gw: '10.90.0.1'
+external_iface: 'eth0'
+management_network: 10.6.0.0/24
 
+deploy_docker_registry: "10.90.0.251:5000"
 
-  # all of these are written to genconfig/config.yml, and needs a rework
+headnode: cord@10.90.0.251
 
-  # Network address information for the head node:
-  #
-  # fabric_ip     - the IP address and mask bits to be used to configure the network
-  #                 interface connected to the leaf - spine fabric
-  #
-  # management_ip - the IP address and mask bits to be used to configure the network
-  #                 interface connecting the head node to the POD internal
-  #                 management network. The head node will deliver DHCP addresses to
-  #                 the other compute nodes over this interface
-  #
-  # external_ip   - the IP address and mask bits to be used to configure the network
-  #                 interface connecting the head node (and the POD) to the
-  #                 Internet. All traffic in the POD to external hosts will be
-  #                 NAT-ed through this interface
-  fabric_ip: '10.6.1.1/24'
-  management_ip: '10.6.0.1/24'
-  external_ip: '10.90.0.251/16'
-  external_iface: 'eth0'
-  external_gw: '10.90.0.1'
-  skipTags:
+# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
+# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
+# one level up from the `cord` directory
+host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
 
-passwords:
-  compute_node: "ubuntu"
-  maas_admin: "admin"
-  maas_user: "cord"
+build_targets:
+  - 'setup-automation'
 
-docker:
-  imageVersion: candidate
+copy_cord_prereqs:
+  - 'config-ssh-key'
 
-otherNodes:
-  # Experimental
-  #
-  # Specifies the subnet and address range that will be used to allocate IP addresses
-  # to the compute nodes as they are deployed into the POD.
-  fabric:
-    network: 10.6.1.1/24
-    range_low: 10.6.1.2
-    range_high: 10.6.1.253
+skipTags:
+  - 'set_compute_node_password'
+
+# Wait until headnode prepped before building containers, for consistent DNS
+docker_images_prereqs:
+  - 'prep-headnode'
+
+# node topology
+physical_node_list:
+  - name: head1
+    aliases:
+      - head
+
+# Inventory for ansible, used to generate inventory.ini
+inventory_groups:
+  config:
+    localhost:
+      ansible_connection: local
+  build:
+    corddev:
+  head:
+    head1:
+      ansible_host: 10.90.0.251
+      ansible_port: 22
+      ansible_user: cord
+      ansible_ssh_pass: cord
+  compute: