diff --git a/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2 b/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2
index 76b76714349678aa0a00b6e4f0b6eb517ab3c44f..130ddfa036aa1e3f7d3c51121c7bf3a35e602e00 100644
--- a/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2
+++ b/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2
@@ -17,7 +17,15 @@
   "graphTooltip": 0,
   "schemaVersion": 27,
   "style": "dark",
-  "tags": ["customers"],
+  {% if not tags %}
+  "tags": ["{{ tag }}"],
+  {% else %}
+  "tags": [
+    {% for tag in tags %}
+      "{{ tag }}"{{ "," if not loop.last }}
+    {% endfor %}
+  ],
+  {% endif %}
   "templating": {
     "list": []
   },