diff --git a/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml b/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
index ef4de36a1..6c59cc371 100644
--- a/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
+++ b/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
@@ -34,9 +34,206 @@ data:
       "editable": true,
       "fiscalYearStartMonth": 0,
       "graphTooltip": 0,
+      "id": 692859,
       "links": [],
       "liveNow": false,
       "panels": [
+        {
+          "collapsed": false,
+          "gridPos": {
+            "h": 1,
+            "w": 24,
+            "x": 0,
+            "y": 0
+          },
+          "id": 240,
+          "panels": [],
+          "title": "Worker status",
+          "type": "row"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "custom": {
+                "axisBorderShow": false,
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 5,
+                "gradientMode": "scheme",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "insertNulls": false,
+                "lineInterpolation": "linear",
+                "lineStyle": {
+                  "fill": "solid"
+                },
+                "lineWidth": 2,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "fieldMinMax": false,
+              "mappings": [],
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "yellow",
+                    "value": 1
+                  },
+                  {
+                    "color": "green",
+                    "value": 2
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 0,
+            "y": 1
+          },
+          "id": 242,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": false
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "pluginVersion": "10.4.1",
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "${datasource}"
+              },
+              "editorMode": "code",
+              "expr": "sum (clamp_min(image_builder_worker_active_workers{tenant=~\"$tenant\",arch=~\"$arch\"}, 0))",
+              "instant": false,
+              "interval": "",
+              "legendFormat": "__auto",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Active workers",
+          "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${datasource}"
+          },
+          "description": "",
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "thresholds"
+              },
+              "mappings": [],
+              "min": 0,
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "red",
+                    "value": null
+                  },
+                  {
+                    "color": "yellow",
+                    "value": 1
+                  },
+                  {
+                    "color": "green",
+                    "value": 2
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 1
+          },
+          "id": 243,
+          "options": {
+            "displayMode": "lcd",
+            "maxVizHeight": 300,
+            "minVizHeight": 16,
+            "minVizWidth": 8,
+            "namePlacement": "auto",
+            "orientation": "horizontal",
+            "reduceOptions": {
+              "calcs": [
+                "lastNotNull"
+              ],
+              "fields": "",
+              "values": false
+            },
+            "showUnfilled": true,
+            "sizing": "auto",
+            "valueMode": "color"
+          },
+          "pluginVersion": "10.4.1",
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "${datasource}"
+              },
+              "editorMode": "code",
+              "expr": "sum by(arch) (clamp_min(image_builder_worker_active_workers{tenant=~\"$tenant\"}, 0))",
+              "instant": false,
+              "legendFormat": "__auto",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Active workers",
+          "type": "bargauge"
+        },
         {
           "collapsed": false,
           "datasource": {
@@ -46,7 +243,7 @@ data:
             "h": 1,
             "w": 24,
             "x": 0,
-            "y": 0
+            "y": 9
           },
           "id": 212,
           "panels": [],
@@ -103,7 +300,7 @@ data:
             "h": 8,
             "w": 4,
             "x": 0,
-            "y": 1
+            "y": 10
           },
           "id": 197,
           "mappings": [
@@ -228,7 +425,7 @@ data:
             "h": 8,
             "w": 12,
             "x": 4,
-            "y": 1
+            "y": 10
           },
           "id": 202,
           "options": {
@@ -338,7 +535,7 @@ data:
             "h": 8,
             "w": 8,
             "x": 16,
-            "y": 1
+            "y": 10
           },
           "id": 228,
           "options": {
@@ -432,7 +629,7 @@ data:
             "h": 8,
             "w": 4,
             "x": 0,
-            "y": 9
+            "y": 18
           },
           "id": 238,
           "maxDataPoints": 100,
@@ -547,7 +744,7 @@ data:
             "h": 8,
             "w": 20,
             "x": 4,
-            "y": 9
+            "y": 18
           },
           "id": 239,
           "options": {
@@ -590,7 +787,7 @@ data:
             "h": 1,
             "w": 24,
             "x": 0,
-            "y": 17
+            "y": 26
           },
           "id": 129,
           "panels": [],
@@ -647,7 +844,7 @@ data:
             "h": 8,
             "w": 4,
             "x": 0,
-            "y": 18
+            "y": 27
           },
           "id": 200,
           "mappings": [
@@ -811,7 +1008,7 @@ data:
             "h": 8,
             "w": 12,
             "x": 4,
-            "y": 18
+            "y": 27
           },
           "id": 201,
           "options": {
@@ -939,7 +1136,7 @@ data:
             "h": 8,
             "w": 8,
             "x": 16,
-            "y": 18
+            "y": 27
           },
           "id": 210,
           "options": {
@@ -1032,7 +1229,7 @@ data:
             "h": 8,
             "w": 4,
             "x": 0,
-            "y": 26
+            "y": 35
           },
           "id": 198,
           "maxDataPoints": 100,
@@ -1149,7 +1346,7 @@ data:
             "h": 8,
             "w": 20,
             "x": 4,
-            "y": 26
+            "y": 35
           },
           "id": 199,
           "options": {
@@ -1192,7 +1389,7 @@ data:
             "h": 1,
             "w": 24,
             "x": 0,
-            "y": 34
+            "y": 43
           },
           "id": 207,
           "panels": [],
@@ -1248,7 +1445,7 @@ data:
             "h": 8,
             "w": 4,
             "x": 0,
-            "y": 35
+            "y": 44
           },
           "id": 208,
           "mappings": [
@@ -1401,7 +1598,7 @@ data:
             "h": 8,
             "w": 12,
             "x": 4,
-            "y": 35
+            "y": 44
           },
           "id": 209,
           "options": {
@@ -1526,7 +1723,7 @@ data:
             "h": 8,
             "w": 8,
             "x": 16,
-            "y": 35
+            "y": 44
           },
           "id": 204,
           "options": {