diff --git a/src/main/asciidoc/analytics/twitter-analytics/main.adoc b/src/main/asciidoc/analytics/twitter-analytics/main.adoc
index 1373603..3df133f 100644
--- a/src/main/asciidoc/analytics/twitter-analytics/main.adoc
+++ b/src/main/asciidoc/analytics/twitter-analytics/main.adoc
@@ -12,7 +12,7 @@ image::scdf-twitter-analytics-animated.gif[Twitter Analytics Animation, scaledwi
 
 ==== Prerequisites
 
-* A running link:https://dataflow.spring.io/docs/installation/local/docker/[Local Data Flow Server] with enabled link:https://dataflow.spring.io/docs/installation/local/docker-customize/#monitoring-with-prometheus-and-grafana[Prometheus and Grafana] monitoring.
+* A running link:https://dataflow.spring.io/docs/installation/local/docker/[Local Data Flow Server] with enabled link:https://dataflow.spring.io/docs/installation/local/docker-customize/#prometheus--grafana[Prometheus and Grafana] monitoring.
 +
 On Linux/Mac, installation instructions would look like this:
 +
diff --git a/src/main/asciidoc/images/twitter_analytics.png b/src/main/asciidoc/images/twitter_analytics.png
index d63e096..c5613fa 100644
Binary files a/src/main/asciidoc/images/twitter_analytics.png and b/src/main/asciidoc/images/twitter_analytics.png differ
diff --git a/src/main/asciidoc/monitoring/grafana-twitter-scdf-analytics.json b/src/main/asciidoc/monitoring/grafana-twitter-scdf-analytics.json
index d8f9919..ab14de4 100644
--- a/src/main/asciidoc/monitoring/grafana-twitter-scdf-analytics.json
+++ b/src/main/asciidoc/monitoring/grafana-twitter-scdf-analytics.json
@@ -12,26 +12,20 @@
   "__requires": [
     {
       "type": "panel",
-      "id": "digrich-bubblechart-panel",
-      "name": "Bubble Chart",
-      "version": "1.1.0"
+      "id": "bargauge",
+      "name": "Bar gauge",
+      "version": ""
     },
     {
       "type": "grafana",
       "id": "grafana",
       "name": "Grafana",
-      "version": "6.3.3"
+      "version": "8.0.2"
     },
     {
       "type": "panel",
-      "id": "grafana-piechart-panel",
-      "name": "Pie Chart",
-      "version": "1.3.9"
-    },
-    {
-      "type": "panel",
-      "id": "graph",
-      "name": "Graph",
+      "id": "piechart",
+      "name": "Pie chart",
       "version": ""
     },
     {
@@ -67,13 +61,30 @@
   ],
   "panels": [
     {
-      "aliasColors": {},
-      "bars": true,
-      "dashLength": 10,
-      "dashes": false,
       "datasource": "${DS_SCDFPROMETHEUS}",
-      "fill": 1,
-      "fillGradient": 0,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
       "gridPos": {
         "h": 10,
         "w": 15,
@@ -81,31 +92,22 @@
         "y": 0
       },
       "id": 6,
-      "legend": {
-        "alignAsTable": false,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": false,
-      "linewidth": 1,
       "links": [],
-      "nullPointMode": "null",
+      "maxDataPoints": 100,
       "options": {
-        "dataLinks": []
+        "displayMode": "gradient",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "text": {}
       },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
+      "pluginVersion": "8.0.2",
       "targets": [
         {
           "expr": "sort_desc(topk(10, sum(language_total) by (lang)))",
@@ -116,60 +118,32 @@
           "refId": "A"
         }
       ],
-      "thresholds": [],
       "timeFrom": null,
-      "timeRegions": [],
       "timeShift": null,
       "title": "Top 10 Lang",
-      "tooltip": {
-        "shared": false,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "series",
-        "name": null,
-        "show": true,
-        "values": [
-          "current"
-        ]
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": "",
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": false
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
+      "type": "bargauge"
     },
     {
-      "aliasColors": {},
-      "breakPoint": "50%",
       "cacheTimeout": null,
-      "combine": {
-        "label": "Others",
-        "threshold": 0
-      },
       "datasource": "${DS_SCDFPROMETHEUS}",
-      "fontSize": "80%",
-      "format": "short",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "decimals": 0,
+          "mappings": [],
+          "unit": "short"
+        },
+        "overrides": []
+      },
       "gridPos": {
         "h": 22,
         "w": 9,
@@ -178,17 +152,33 @@
       },
       "id": 4,
       "interval": null,
-      "legend": {
-        "show": true,
-        "values": true
-      },
-      "legendType": "Under graph",
       "links": [],
       "maxDataPoints": 3,
-      "nullPointMode": "connected",
-      "options": {},
-      "pieType": "donut",
-      "strokeWidth": 1,
+      "options": {
+        "displayLabels": [
+          "name",
+          "value"
+        ],
+        "legend": {
+          "calcs": [],
+          "displayMode": "table",
+          "placement": "bottom",
+          "values": [
+            "value"
+          ]
+        },
+        "pieType": "donut",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
       "targets": [
         {
           "expr": "sort_desc(topk(50, sum(hashtags_total) by (htag)))",
@@ -200,63 +190,68 @@
         }
       ],
       "title": "Hastags",
-      "type": "grafana-piechart-panel",
-      "valueName": "current"
+      "type": "piechart"
     },
     {
-      "bgColor": null,
-      "colorScheme": "Unique",
-      "datasource": "${DS_SCDFPROMETHEUS}",
-      "decimal": 2,
-      "displayLabel": true,
-      "format": "short",
-      "gradientColors": [
-        "red",
-        "green"
-      ],
-      "gradientThresholds": "50,80",
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "mappings": []
+        },
+        "overrides": []
+      },
       "gridPos": {
         "h": 12,
         "w": 15,
         "x": 0,
         "y": 10
       },
-      "groupDepthColors": [
-        "hsl(152,80%,80%)",
-        "hsl(228,30%,40%)"
-      ],
-      "groupSeperator": ",",
-      "height": 400,
-      "id": 2,
-      "links": [],
-      "mode": "time",
-      "nullPointMode": "connected",
-      "options": {},
-      "svgBubbleId": "svg_2",
-      "svgContainer": {},
+      "id": 8,
+      "options": {
+        "displayLabels": [
+          "percent"
+        ],
+        "legend": {
+          "displayMode": "hidden",
+          "placement": "bottom"
+        },
+        "pieType": "pie",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
       "targets": [
         {
+          "exemplar": true,
           "expr": "sum(language_total) by (lang)",
-          "format": "time_series",
-          "instant": true,
-          "intervalFactor": 1,
+          "interval": "",
           "legendFormat": "{{lang}}",
           "refId": "A"
         }
       ],
-      "thresholdColors": [
-        "green",
-        "yellow",
-        "red"
-      ],
-      "thresholds": "50,80",
       "title": "Languages",
-      "type": "digrich-bubblechart-panel",
-      "valueName": "current"
+      "type": "piechart"
     }
   ],
   "refresh": "5s",
-  "schemaVersion": 19,
+  "schemaVersion": 30,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -293,6 +288,6 @@
   },
   "timezone": "",
   "title": "SCDF Analytics",
-  "uid": "vhHweSriz",
-  "version": 3
+  "uid": "sGdeYrZnk",
+  "version": 2
 }