diff --git a/consul/map.jinja b/consul/map.jinja
index f4e9737..e5bbf72 100644
--- a/consul/map.jinja
+++ b/consul/map.jinja
@@ -1,7 +1,9 @@
 {% import_yaml slspath+"/defaults.yaml" as defaults %}
 
+{% set consul = salt['pillar.get']('consul', default=defaults.consul, merge=True) %}
+
 {## Add any overrides based on CPU architecture. ##}
-{% set cpu_arch_map = salt['grains.filter_by']({
+{% set consul = salt['grains.filter_by']({
         'armv6l': {
             "arch": 'arm'
         },
@@ -13,10 +15,7 @@
         }
   }
   ,grain="cpuarch"
-  ,merge=salt['pillar.get']('consul'))
+  ,merge=consul)
 %}
-{% do defaults.consul.update(cpu_arch_map) %}
-
-{% set consul = salt['pillar.get']('consul', default=defaults.consul, merge=True) %}
 
 {% do consul.config.update({'retry_join': consul.config.retry_join or []}) %}