diff --git a/ansible/roles/genconfig/templates/config.mk.j2 b/ansible/roles/genconfig/templates/config.mk.j2
index 7e4aeab..ef2351b 100644
--- a/ansible/roles/genconfig/templates/config.mk.j2
+++ b/ansible/roles/genconfig/templates/config.mk.j2
@@ -20,9 +20,6 @@
 # ** 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(' ') }}
@@ -35,9 +32,8 @@
 {% 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 }}
+# For MAAS
+DOCKER_REGISTRY         = {{ deploy_docker_registry }}
 {% endif %}
 {% if deploy_docker_tag is defined %}
 DEPLOY_DOCKER_TAG       = {{ deploy_docker_tag }}
@@ -80,6 +76,9 @@
 {% if deploy_onos_prereqs is defined %}
 DEPLOY_ONOS_PREREQS     = $(M)/{{ deploy_onos_prereqs | join(" $(M)/") }}
 {% endif %}
+{% if deploy_mavenrepo_prereqs is defined %}
+DEPLOY_MAVENREPO_PREREQS     = $(M)/{{ deploy_mavenrepo_prereqs | join(" $(M)/") }}
+{% endif %}
 {% if deploy_openstack_prereqs is defined %}
 DEPLOY_OPENSTACK_PREREQS = $(M)/{{ deploy_openstack_prereqs | join(" $(M)/") }}
 {% endif %}