diff --git a/Makefile b/Makefile
index 70ef96f7..cc26a3e0 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ else ifeq (${UNAME}, Darwin)
   INPLACE_SED=sed -i ""
 endif
 
-TAG ?= v0.3.1
+TAG ?= v0.3.2
 REGISTRY ?= quay.io
 ORG ?= 3scale
 PROJECT ?= 3scale-saas-operator
diff --git a/roles/zync/templates/zync-grafanadashboard.yaml b/roles/zync/templates/zync-grafanadashboard.yaml
index ff3a9080..11a77dd5 100644
--- a/roles/zync/templates/zync-grafanadashboard.yaml
+++ b/roles/zync/templates/zync-grafanadashboard.yaml
@@ -934,7 +934,7 @@ spec:
           "dashLength": 10,
           "dashes": false,
           "datasource": "$datasource",
-          "description": "Jobs scheduled to be executed in the future.",
+          "description": "Number of jobs enqueued and ready to be executed ASAP (never failed, nor got expired).",
           "fill": 1,
           "gridPos": {
             "h": 8,
@@ -967,7 +967,7 @@ spec:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "max(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='scheduled'}) by (exported_job)",
+              "expr": "max(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='ready'}) by (exported_job)",
               "format": "time_series",
               "interval": "1m",
               "intervalFactor": 10,
@@ -979,7 +979,7 @@ spec:
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Scheduled Jobs count",
+          "title": "Ready Jobs count",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1023,7 +1023,7 @@ spec:
           "dashLength": 10,
           "dashes": false,
           "datasource": "$datasource",
-          "description": "Jobs that failed at least once (rate)",
+          "description": "Number of jobs enqueued to be executed some time in the future, but not now (never failed, nor got expired).",
           "fill": 1,
           "gridPos": {
             "h": 8,
@@ -1031,7 +1031,7 @@ spec:
             "x": 0,
             "y": 48
           },
-          "id": 92,
+          "id": 93,
           "legend": {
             "avg": false,
             "current": false,
@@ -1056,7 +1056,7 @@ spec:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "max(rate(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='failed'}[5m])) by (exported_job)",
+              "expr": "max(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='scheduled'}) by (exported_job)",
               "format": "time_series",
               "interval": "1m",
               "intervalFactor": 10,
@@ -1068,7 +1068,7 @@ spec:
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Failed Jobs per second",
+          "title": "Scheduled Jobs count",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1085,7 +1085,7 @@ spec:
           "yaxes": [
             {
               "decimals": 0,
-              "format": "ops",
+              "format": "none",
               "label": null,
               "logBase": 1,
               "max": null,
@@ -1097,7 +1097,7 @@ spec:
               "label": null,
               "logBase": 1,
               "max": null,
-              "min": "0",
+              "min": null,
               "show": true
             }
           ],
@@ -1112,7 +1112,7 @@ spec:
           "dashLength": 10,
           "dashes": false,
           "datasource": "$datasource",
-          "description": "Jobs that failed at least once",
+          "description": "Number of jobs that executed successfully.",
           "fill": 1,
           "gridPos": {
             "h": 8,
@@ -1201,15 +1201,15 @@ spec:
           "dashLength": 10,
           "dashes": false,
           "datasource": "$datasource",
-          "description": "Excludes: errored, expired, finished, performed",
+          "description": "Number of jobs that failed at least once, did not run out of attempts to retry and therefore are scheduled for retry any time soon.",
           "fill": 1,
           "gridPos": {
             "h": 7,
-            "w": 8,
+            "w": 12,
             "x": 0,
             "y": 56
           },
-          "id": 93,
+          "id": 96,
           "legend": {
             "avg": false,
             "current": false,
@@ -1234,7 +1234,7 @@ spec:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "max(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='ready'}) by (exported_job)",
+              "expr": "max(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='finished'}) by (exported_job)",
               "format": "time_series",
               "interval": "1m",
               "intervalFactor": 10,
@@ -1246,7 +1246,7 @@ spec:
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Ready Jobs count",
+          "title": "Finished Jobs count",
           "tooltip": {
             "shared": true,
             "sort": 2,
@@ -1290,12 +1290,12 @@ spec:
           "dashLength": 10,
           "dashes": false,
           "datasource": "$datasource",
-          "description": "Jobs with at least 1 retry attempt",
+          "description": "Number of jobs that failed and ran out of attempts to retry, therefore won't be retried again.",
           "fill": 1,
           "gridPos": {
             "h": 7,
-            "w": 8,
-            "x": 8,
+            "w": 12,
+            "x": 12,
             "y": 56
           },
           "id": 95,
@@ -1323,7 +1323,7 @@ spec:
           "steppedLine": false,
           "targets": [
             {
-              "expr": "max(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='retried'}) by (exported_job)",
+              "expr": "max(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='expired'}) by (exported_job)",
               "format": "time_series",
               "interval": "1m",
               "intervalFactor": 10,
@@ -1335,96 +1335,7 @@ spec:
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Retried Jobs count",
-          "tooltip": {
-            "shared": true,
-            "sort": 2,
-            "value_type": "individual"
-          },
-          "type": "graph",
-          "xaxis": {
-            "buckets": null,
-            "mode": "time",
-            "name": null,
-            "show": true,
-            "values": []
-          },
-          "yaxes": [
-            {
-              "decimals": 0,
-              "format": "none",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": "0",
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ],
-          "yaxis": {
-            "align": false,
-            "alignLevel": null
-          }
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "dashLength": 10,
-          "dashes": false,
-          "datasource": "$datasource",
-          "description": "Jobs already performed",
-          "fill": 1,
-          "gridPos": {
-            "h": 7,
-            "w": 8,
-            "x": 16,
-            "y": 56
-          },
-          "id": 96,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
-            "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 1,
-          "links": [],
-          "nullPointMode": "null",
-          "options": {},
-          "percentage": false,
-          "pointradius": 2,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "spaceLength": 10,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "expr": "max(que_jobs_scheduled_total{namespace='$namespace',pod=~'zync-que.*',type='finished'}) by (exported_job)",
-              "format": "time_series",
-              "interval": "1m",
-              "intervalFactor": 10,
-              "legendFormat": "{{ '{{' }}exported_job{{ '}}' }}",
-              "refId": "A"
-            }
-          ],
-          "thresholds": [],
-          "timeFrom": null,
-          "timeRegions": [],
-          "timeShift": null,
-          "title": "Finished Jobs count",
+          "title": "Expired Jobs count",
           "tooltip": {
             "shared": true,
             "sort": 2,