diff --git a/sudoers/files/sudoers b/sudoers/files/sudoers
index 2463867..1786748 100644
--- a/sudoers/files/sudoers
+++ b/sudoers/files/sudoers
@@ -95,11 +95,11 @@ Runas_Alias {{ name }} = {{ ",".join(runas) }}
 %{{ group }} {{ spec }}
   {%- endfor %}
 {%- endfor %}
-{%- for unix_group in ad_groups.keys() %}
+{%- for unix_group in ad_groups %}
   {%- if unix_group in ad_group_maps.keys() %}
-%{{ unix_group }} {{ ad_group_maps.unix_group }}
+%{{ unix_group }} {{ ad_group_maps[unix_group] }}
   {%- else %}
-%{{ unix_group }} {{ ad_group_maps.default }}
+%{{ unix_group }} {{ ad_group_maps['default'] }}
   {%- endif %}
 {%- endfor %}
 
diff --git a/sudoers/map.jinja b/sudoers/map.jinja
index 6da727c..6e9f78e 100644
--- a/sudoers/map.jinja
+++ b/sudoers/map.jinja
@@ -16,9 +16,10 @@
 
 {% set ad_group_maps = salt['grains.filter_by']({
     'default': { 'default': 'ALL = (ALL:ALL) NOPASSWD: SUPPORT' },
-    'dev': { 'default': 'ALL = (ALL:ALL) NOPASSWD: ALL' },
-    'qa': { 'default': 'ALL = (ALL:ALL) NOPASSWD: SUPPORT',
-            'plosqa': 'ALL = (ALL:ALL) NOPASSWD: ALL' },
+    'vagrant': { 'default': 'ALL = (ALL:ALL) NOPASSWD: ALL' },
+    'dev':     { 'default': 'ALL = (ALL:ALL) NOPASSWD: ALL' },
+    'qa':      { 'default': 'ALL = (ALL:ALL) NOPASSWD: SUPPORT',
+                 'plosqa': 'ALL = (ALL:ALL) NOPASSWD: ALL' },
     },
     grain='environment',
     merge=salt['pillar.get']('group_maps:lookup', None))