diff --git a/grafana/config/file.sls b/grafana/config/file.sls
index 2a2c2a5..18a2b11 100644
--- a/grafana/config/file.sls
+++ b/grafana/config/file.sls
@@ -20,6 +20,7 @@ grafana-config-file-file-managed:
     - mode: 640
     - user: root
     - group: {{ grafana.group }}
+    - makedirs: True
     - template: jinja
     - context:
         config: {{ grafana.config|json }}
diff --git a/grafana/osfamilymap.yaml b/grafana/osfamilymap.yaml
index df34c6e..bd0f909 100644
--- a/grafana/osfamilymap.yaml
+++ b/grafana/osfamilymap.yaml
@@ -10,6 +10,10 @@
 # you will need to provide at least an empty dict in this file, e.g.
 # osfamilymap: {}
 ---
+{%- if grains.os == 'MacOS' %}
+  {% set macos_group = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
+{%- endif %}
+
 Debian:
   pkgrepo:
     humanname: grafana_official
@@ -47,4 +51,7 @@ Solaris: {}
 
 Windows: {}
 
-MacOS: {}
+MacOS:
+  rootgroup: {{ macos_group | d('') }}
+  service:
+    group: {{ macos_group | d('') }}