diff --git a/roles/juju-setup/defaults/main.yml b/roles/juju-setup/defaults/main.yml
index 882473d..0802ced 100644
--- a/roles/juju-setup/defaults/main.yml
+++ b/roles/juju-setup/defaults/main.yml
@@ -1,3 +1,4 @@
+---
 
 # Copyright 2017-present Open Networking Foundation
 #
@@ -13,10 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
----
 # juju-setup/defaults/main.yml
-
+#
 # note: juju_config_path and charm_versions are also set in
 # `juju-compute-setup/defaults/main.yml`.  Keep these in sync.
 
@@ -31,7 +30,7 @@
 
 keystone_admin_password: "{{ lookup('password', credentials_dir ~ '/cord_keystone_admin chars=ascii_letters,digits') }}"
 
-enable_dpdk: False
+use_dpdk: False
 vcpu_pin_set: "^0,^2"
 hugepages: "60%"
 dpdk_socket_memory: "1024,0"
diff --git a/roles/juju-setup/templates/juju_config.yml.j2 b/roles/juju-setup/templates/juju_config.yml.j2
index cd6b929..f3db2ae 100644
--- a/roles/juju-setup/templates/juju_config.yml.j2
+++ b/roles/juju-setup/templates/juju_config.yml.j2
@@ -1,4 +1,4 @@
-
+---
 {#
 Copyright 2017-present Open Networking Foundation
 
@@ -15,8 +15,6 @@
 limitations under the License.
 #}
 
-
----
 # juju configuration file for CORD deployments
 
 ceilometer:
@@ -49,7 +47,7 @@
   onos-vtn-port: 8182
   neutron-security-groups: "True"
   overlay-network-type: vxlan
-  {% if enable_dpdk -%}
+  {% if use_dpdk -%}
   onos-vtn-branch: cord-2.0-dpdk-kilo
   {% endif %}
 
@@ -60,7 +58,7 @@
   config-flags: "force_config_drive=always"
   console-access-protocol: novnc
   network-manager: Neutron
-  {% if enable_dpdk -%}
+  {% if use_dpdk -%}
   scheduler-default-filters: "RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,NUMATopologyFilter"
   {% endif %}
 
@@ -68,7 +66,7 @@
   openstack-origin: "cloud:trusty-kilo"
   virt-type: kvm
   disable-neutron-security-groups: "True"
-  {% if enable_dpdk -%}
+  {% if use_dpdk -%}
   config-flags: "firewall_driver=nova.virt.firewall.NoopFirewallDriver,vcpu_pin_set={{ vcpu_pin_set }}"
   enable-dpdk: True
   hugepages: "{{ hugepages }}"