diff --git a/grafana/files/grafana.ini b/grafana/files/grafana.ini
index 6d48fad..5762081 100644
--- a/grafana/files/grafana.ini
+++ b/grafana/files/grafana.ini
@@ -140,6 +140,18 @@ auto_assign_org_role = {{ server.get('users', {}).get('auto_assign_role', 'Viewe
 
 #################################### Anonymous Auth ##########################
 [auth.anonymous]
+{%- if server.get('auth', {}).get('engine', None) == 'anonymous' %}
+enabled = true
+
+{%- if server.auth.organization is defined %}
+org_name = {{ server.auth.organization }}
+{%- endif %}
+
+{%- if server.auth.role is defined %}
+org_name = {{ server.auth.role }}
+{%- endif %}
+
+{%- else %}
 # enable anonymous access
 ;enabled = false
 
@@ -148,6 +160,7 @@ auto_assign_org_role = {{ server.get('users', {}).get('auto_assign_role', 'Viewe
 
 # specify role for unauthenticated users
 ;org_role = Viewer
+{%- endif %}
 
 #################################### Github Auth ##########################
 [auth.github]