diff --git a/ansible/roles/genconfig/templates/config.mk.j2 b/ansible/roles/genconfig/templates/config.mk.j2
index fa6bcbf..28329aa 100644
--- a/ansible/roles/genconfig/templates/config.mk.j2
+++ b/ansible/roles/genconfig/templates/config.mk.j2
@@ -2,6 +2,9 @@
 # ** DO NOT EDIT THIS FILE MANUALLY! **
 # Edit the Pod Config (or Scenario) and rerun `make config` to regenerate it
 
+# Needed for MaaS, not settable
+DOCKER_REGISTRY         = docker-registry:5000
+
 # Scenario specific config
 {% if vagrant_vms is defined %}
 VAGRANT_VMS             = {{ vagrant_vms | join(' ') }}
@@ -12,12 +15,24 @@
 {% if buildnode is defined %}
 BUILDNODE               = {{ buildnode }}
 {% endif %}
+{% if deploy_docker_registry is defined %}
+DEPLOY_DOCKER_REGISTRY  = {{ deploy_docker_registry }}
+{% endif %}
+{% if deploy_docker_tag is defined %}
+DEPLOY_DOCKER_TAG       = {{ deploy_docker_tag }}
+{% endif %}
 {% if deploy_docker_tag is defined %}
 DEPLOY_DOCKER_TAG       = {{ deploy_docker_tag }}
 {% endif %}
 {% if config_cord_profile_dir is defined %}
 CONFIG_CORD_PROFILE_DIR = {{ config_cord_profile_dir }}
 {% endif %}
+{% if build_cord_dir is defined %}
+BUILD_CORD_DIR = {{ build_cord_dir }}
+{% endif %}
+{% if skipTags is defined %}
+ANSIBLE_ARGS += --skip-tags "{{ skipTags | join(",") }}"
+{% endif %}
 
 # Targets and prerequisties
 {% if build_targets is defined %}
@@ -47,4 +62,10 @@
 {% if deploy_onos_prereqs is defined %}
 DEPLOY_ONOS_PREREQS     = $(M)/{{ deploy_onos_prereqs | join(" $(M)/") }}
 {% endif %}
+{% if deploy_openstack_prereqs is defined %}
+DEPLOY_OPENSTACK_PREREQS = $(M)/{{ deploy_openstack_prereqs | join(" $(M)/") }}
+{% endif %}
+{% if setup_automation_prereqs is defined %}
+SETUP_AUTOMATION_PREREQS = $(M)/{{ setup_automation_prereqs | join(" $(M)/") }}
+{% endif %}
 
diff --git a/ansible/roles/prod/files/fabric.cfg b/ansible/roles/head-net/files/fabric.cfg
similarity index 100%
rename from ansible/roles/prod/files/fabric.cfg
rename to ansible/roles/head-net/files/fabric.cfg
diff --git a/ansible/roles/prod/files/mgmtbr.cfg b/ansible/roles/head-net/files/mgmtbr.cfg
similarity index 100%
rename from ansible/roles/prod/files/mgmtbr.cfg
rename to ansible/roles/head-net/files/mgmtbr.cfg
diff --git a/ansible/roles/prod/tasks/main.yml b/ansible/roles/head-net/tasks/main.yml
similarity index 100%
rename from ansible/roles/prod/tasks/main.yml
rename to ansible/roles/head-net/tasks/main.yml