diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index a1e6bae..77a5ef2 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -1825,7 +1825,7 @@ alternative.mongo.{{ name }}: {{ value }}
 {% endif %}
 {%- endif %}
 
-{%- for configname in cfg_master %}
+{%- for configname in cfg_master|sort %}
 {%- if configname not in reserved_keys and configname not in default_keys %}
 {{ configname }}:
   {{ cfg_master[configname]| yaml(False) | indent(2) }}
diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
index fd8e932..3e5c38c 100644
--- a/salt/files/minion.d/f_defaults.conf
+++ b/salt/files/minion.d/f_defaults.conf
@@ -1251,7 +1251,7 @@ alternative.mongo.{{ name }}: {{ value }}
 {% endif %}
 {%- endif %}
 
-{%- for configname in cfg_minion %}
+{%- for configname in cfg_minion|sort %}
 {%- if configname not in reserved_keys and configname not in default_keys %}
   {%- if cfg_minion[configname] is iterable and cfg_minion[configname] is not mapping and cfg_minion[configname] is not string %}
 {{ configname }}: