diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 0f35b2a..23bd245 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -323,11 +323,9 @@ event_return_blacklist:
 # disabled.
 {% if 'client_acl' in cfg_master -%}
 client_acl:
-{%- for name, user in cfg_master['client_acl']|dictsort %}
+{%- for name, items in cfg_master['client_acl']|dictsort %}
   {{ name}}:
-{%- for command in user %}
-    - {% raw %}'{% endraw %}{{ command }}{% raw %}'{% endraw %}
-{%- endfor -%}
+    {{ items | yaml }}
 {%- endfor -%}
 {% elif 'client_acl' in cfg_salt -%}
 client_acl: