diff --git a/manifests/grafana-dashboards/exneuland-dashboard.yaml b/manifests/grafana-dashboards/exneuland-dashboard.yaml
index cebca86d7b94fdeae97056d26b0973558c7031f8..054981530b49b51a3dc8b08278b7c29ae1e15bb9 100644
--- a/manifests/grafana-dashboards/exneuland-dashboard.yaml
+++ b/manifests/grafana-dashboards/exneuland-dashboard.yaml
@@ -25,8 +25,8 @@ data:
       "editable": true,
       "fiscalYearStartMonth": 0,
       "graphTooltip": 0,
-      "id": 29,
-      "iteration": 1640619507950,
+      "id": 3,
+      "iteration": 1640796713747,
       "links": [],
       "liveNow": false,
       "panels": [
@@ -260,9 +260,14 @@ data:
           },
           "id": 34,
           "options": {
+            "displayLabels": [],
             "legend": {
-              "displayMode": "list",
-              "placement": "bottom"
+              "displayMode": "table",
+              "placement": "bottom",
+              "values": [
+                "percent",
+                "value"
+              ]
             },
             "pieType": "pie",
             "reduceOptions": {
@@ -289,7 +294,7 @@ data:
               "refId": "A"
             }
           ],
-          "title": "Popular Maps (Top 25) (now)",
+          "title": "Popular Maps (now)",
           "type": "piechart"
         },
         {
@@ -314,7 +319,8 @@ data:
                 "lineWidth": 1,
                 "pointSize": 5,
                 "scaleDistribution": {
-                  "type": "linear"
+                  "log": 2,
+                  "type": "log"
                 },
                 "showPoints": "auto",
                 "spanNulls": false,
@@ -352,9 +358,15 @@ data:
           "id": 40,
           "options": {
             "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom"
+              "calcs": [
+                "last",
+                "min",
+                "max"
+              ],
+              "displayMode": "table",
+              "placement": "bottom",
+              "sortBy": "Last",
+              "sortDesc": true
             },
             "tooltip": {
               "mode": "single"
@@ -524,7 +536,7 @@ data:
             "overrides": []
           },
           "gridPos": {
-            "h": 17,
+            "h": 9,
             "w": 6,
             "x": 18,
             "y": 21
@@ -532,8 +544,12 @@ data:
           "id": 45,
           "options": {
             "legend": {
-              "displayMode": "list",
-              "placement": "bottom"
+              "displayMode": "table",
+              "placement": "bottom",
+              "values": [
+                "value",
+                "percent"
+              ]
             },
             "pieType": "pie",
             "reduceOptions": {
@@ -547,7 +563,6 @@ data:
               "mode": "single"
             }
           },
-          "pluginVersion": "8.3.3",
           "targets": [
             {
               "datasource": {
@@ -555,15 +570,13 @@ data:
                 "uid": "PBFA97CFB590B2093"
               },
               "exemplar": true,
-              "expr": "label_replace(topk(25, sum by (room) (exneuland_cowboy_init_count{namespace=\"prod\"})), \"roomslug\", \"$1\", \"room\", \"https://[^/]+/@/rc3_21/(.+)\")",
+              "expr": "label_replace(topk(25, sum by (room) (exneuland_cowboy_init_count{namespace=\"$environment\"})), \"roomslug\", \"$1\", \"room\", \"https://[^/]+/@/rc3_21/(.+)\")",
               "interval": "",
-              "intervalFactor": 1,
               "legendFormat": "{{roomslug}}",
               "refId": "A"
             }
           ],
-          "title": "Popular Maps (Top 25)",
-          "transformations": [],
+          "title": "Popular Maps",
           "type": "piechart"
         },
         {
@@ -620,7 +633,7 @@ data:
           },
           "gridPos": {
             "h": 8,
-            "w": 18,
+            "w": 12,
             "x": 0,
             "y": 30
           },
@@ -647,6 +660,89 @@ data:
           "title": "Hub Error Rate",
           "type": "timeseries"
         },
+        {
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 30
+          },
+          "id": 46,
+          "options": {
+            "legend": {
+              "calcs": [
+                "last",
+                "max"
+              ],
+              "displayMode": "table",
+              "placement": "bottom"
+            },
+            "tooltip": {
+              "mode": "single"
+            }
+          },
+          "targets": [
+            {
+              "exemplar": true,
+              "expr": "label_replace((sum by (room) (exneuland_cowboy_init_count{namespace=\"$environment\"})) - (sum by (room) (exneuland_cowboy_terminate_count{namespace=\"$environment\"})), \"roomslug\", \"$1\", \"room\", \"https://[^/]+/@/rc3_21/(.+)\")",
+              "interval": "",
+              "legendFormat": "{{roomslug}}",
+              "refId": "A"
+            }
+          ],
+          "title": "Popular Maps (now)",
+          "type": "timeseries"
+        },
         {
           "collapsed": false,
           "gridPos": {
@@ -951,6 +1047,10 @@ data:
                   {
                     "color": "green",
                     "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
                   }
                 ]
               }