diff --git a/grafana/init.sls b/grafana/init.sls
index feac486..0e9df70 100644
--- a/grafana/init.sls
+++ b/grafana/init.sls
@@ -1,10 +1,10 @@
 
 {%- if pillar.grafana is defined %}
 include:
-{%- if grafana.manage_repo and grains['os_family'] == 'RedHat' %}
-- grafana.repo.redhat
-{%- endif %}
 {%- if pillar.grafana.server is defined %}
+  {%- if pillar.grafana.server.manage_repo and grains['os_family'] == 'RedHat' %}
+- grafana.repo.redhat
+  {%- endif %}
 - grafana.server
 {%- endif %}
 {%- if pillar.grafana.client is defined %}
diff --git a/grafana/map.jinja b/grafana/map.jinja
index 13e80c2..628476e 100644
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@@ -1,6 +1,7 @@
 
 {%- load_yaml as server_defaults %}
 Debian:
+  manage_repo: false
   pkgs:
   - grafana
   service: grafana-server
@@ -51,6 +52,7 @@ Debian:
   dashboards:
     enabled: false
 RedHat:
+  manage_repo: true
   pkgs:
   - grafana
   service: grafana-server