diff --git a/salt/minion.sls b/salt/minion.sls
index 97db5b3..00a5e6d 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -220,14 +220,16 @@ salt-minion-pki-dir:
     - name: {{ salt_settings.config_path | path_join('pki', 'minion') }}
 {% endif %}
     - user: {{ salt_settings.rootuser }}
-    - group:
+    - group: salt
+{#
         {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
         wheel
         {%- else %}
         {{ salt_settings.rootgroup }}
         {%- endif %}
+#}
     {%- if grains['kernel'] != 'Windows' %}
-    - mode: 700
+    - mode: 750
     {% endif %}
     - makedirs: True
 
@@ -239,14 +241,16 @@ permissions-minion.pem:
     - name: {{ salt_settings.config_path | path_join('pki', 'minion', 'minion.pem') }}
 {% endif %}
     - user: {{ salt_settings.rootuser }}
-    - group:
+    - group: salt
+{#
         {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
         wheel
         {%- else %}
         {{ salt_settings.rootgroup }}
         {%- endif %}
+#}
     {%- if grains['kernel'] != 'Windows' %}
-    - mode: 400
+    - mode: 440
     {% endif %}
     - replace: False
     - require: