diff --git a/deploy/aws/config_build.sh b/deploy/aws/config_build.sh
old mode 100644
new mode 100755
diff --git a/deploy/aws/provision/files/grafana/dashboards/Host.json b/deploy/aws/provision/files/grafana/dashboards/Host.json
index 88e7c6f98..b2c11ed46 100644
--- a/deploy/aws/provision/files/grafana/dashboards/Host.json
+++ b/deploy/aws/provision/files/grafana/dashboards/Host.json
@@ -16,13 +16,94 @@
   "editable": true,
   "gnetId": 179,
   "graphTooltip": 1,
-  "id": 1,
-  "iteration": 1551774642303,
+  "id": 2,
+  "iteration": 1553864453675,
   "links": [],
   "panels": [
+    {
+      "cacheTimeout": null,
+      "colorBackground": false,
+      "colorValue": false,
+      "colors": [
+        "#299c46",
+        "rgba(237, 129, 40, 0.89)",
+        "#d44a3a"
+      ],
+      "datasource": "Prometheus",
+      "format": "s",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 5,
+        "x": 0,
+        "y": 0
+      },
+      "id": 15,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "time() - process_start_time_seconds{job=\"prometheus\"}",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "",
+      "title": "Prometheus Uptime",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
     {
       "cacheTimeout": null,
       "colorBackground": true,
+      "colorPostfix": false,
       "colorValue": false,
       "colors": [
         "#d44a3a",
@@ -39,12 +120,12 @@
         "thresholdMarkers": true
       },
       "gridPos": {
-        "h": 7,
-        "w": 4,
-        "x": 0,
+        "h": 3,
+        "w": 2,
+        "x": 8,
         "y": 0
       },
-      "id": 11,
+      "id": 31,
       "interval": null,
       "links": [],
       "mappingType": 1,
@@ -81,14 +162,14 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(up)",
+          "expr": "sum(up{job=~\"Qed.*\"})/2",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
         }
       ],
-      "thresholds": "0,1",
-      "title": "Targets Online",
+      "thresholds": "1,3",
+      "title": "Qeds",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
@@ -101,52 +182,98 @@
       "valueName": "avg"
     },
     {
-      "columns": [],
-      "fontSize": "100%",
+      "cacheTimeout": null,
+      "colorBackground": true,
+      "colorPostfix": false,
+      "colorValue": false,
+      "colors": [
+        "#d44a3a",
+        "rgba(237, 129, 40, 0.89)",
+        "#299c46"
+      ],
+      "datasource": "Prometheus",
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
       "gridPos": {
-        "h": 7,
-        "w": 11,
-        "x": 4,
+        "h": 3,
+        "w": 2,
+        "x": 10,
         "y": 0
       },
-      "hideTimeOverride": false,
-      "id": 32,
+      "id": 34,
+      "interval": null,
       "links": [],
-      "pageSize": null,
-      "repeat": null,
-      "repeatDirection": "h",
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": null,
-        "desc": false
-      },
-      "styles": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
       "targets": [
         {
-          "expr": "node_load1",
-          "format": "table",
+          "expr": "sum(up{job=~\"Auditor.*\"})/2",
+          "format": "time_series",
           "intervalFactor": 1,
-          "legendFormat": "",
           "refId": "A"
         }
       ],
-      "title": "Hosts list",
-      "transform": "table",
-      "transparent": false,
-      "type": "table"
+      "thresholds": "1,2",
+      "title": "Auditors",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
     },
     {
       "cacheTimeout": null,
-      "colorBackground": false,
+      "colorBackground": true,
+      "colorPostfix": false,
       "colorValue": false,
       "colors": [
-        "#299c46",
+        "#d44a3a",
         "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
+        "#299c46"
       ],
       "datasource": "Prometheus",
-      "format": "s",
+      "format": "none",
       "gauge": {
         "maxValue": 100,
         "minValue": 0,
@@ -155,12 +282,12 @@
         "thresholdMarkers": true
       },
       "gridPos": {
-        "h": 7,
-        "w": 4,
-        "x": 15,
+        "h": 3,
+        "w": 2,
+        "x": 12,
         "y": 0
       },
-      "id": 15,
+      "id": 33,
       "interval": null,
       "links": [],
       "mappingType": 1,
@@ -197,14 +324,14 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "time() - process_start_time_seconds{job=\"prometheus\"}",
+          "expr": "sum(up{job=~\"Monitor.*\"})/2",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
         }
       ],
-      "thresholds": "",
-      "title": "Prometheus Uptime",
+      "thresholds": "1,2",
+      "title": "Monitors",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
@@ -219,11 +346,12 @@
     {
       "cacheTimeout": null,
       "colorBackground": true,
+      "colorPostfix": false,
       "colorValue": false,
       "colors": [
-        "#299c46",
+        "#d44a3a",
         "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
+        "#299c46"
       ],
       "datasource": "Prometheus",
       "format": "none",
@@ -235,12 +363,174 @@
         "thresholdMarkers": true
       },
       "gridPos": {
-        "h": 7,
-        "w": 5,
-        "x": 19,
+        "h": 3,
+        "w": 2,
+        "x": 14,
+        "y": 0
+      },
+      "id": 35,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(up{job=~\"Publisher.*\"})/2",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "1,2",
+      "title": "Publishers",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": true,
+      "colorPostfix": false,
+      "colorValue": false,
+      "colors": [
+        "#d44a3a",
+        "rgba(237, 129, 40, 0.89)",
+        "#299c46"
+      ],
+      "datasource": "Prometheus",
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 2,
+        "x": 16,
+        "y": 0
+      },
+      "id": 36,
+      "interval": null,
+      "links": [],
+      "mappingType": 1,
+      "mappingTypes": [
+        {
+          "name": "value to text",
+          "value": 1
+        },
+        {
+          "name": "range to text",
+          "value": 2
+        }
+      ],
+      "maxDataPoints": 100,
+      "nullPointMode": "connected",
+      "nullText": null,
+      "postfix": "",
+      "postfixFontSize": "50%",
+      "prefix": "",
+      "prefixFontSize": "50%",
+      "rangeMaps": [
+        {
+          "from": "null",
+          "text": "N/A",
+          "to": "null"
+        }
+      ],
+      "sparkline": {
+        "fillColor": "rgba(31, 118, 189, 0.18)",
+        "full": false,
+        "lineColor": "rgb(31, 120, 193)",
+        "show": false
+      },
+      "tableColumn": "",
+      "targets": [
+        {
+          "expr": "sum(up{job=~\"Store.*\"})/2",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "refId": "A"
+        }
+      ],
+      "thresholds": "1,1",
+      "title": "Store",
+      "type": "singlestat",
+      "valueFontSize": "80%",
+      "valueMaps": [
+        {
+          "op": "=",
+          "text": "N/A",
+          "value": "null"
+        }
+      ],
+      "valueName": "avg"
+    },
+    {
+      "cacheTimeout": null,
+      "colorBackground": true,
+      "colorPostfix": false,
+      "colorValue": false,
+      "colors": [
+        "#d44a3a",
+        "rgba(237, 129, 40, 0.89)",
+        "#299c46"
+      ],
+      "datasource": "Prometheus",
+      "format": "none",
+      "gauge": {
+        "maxValue": 100,
+        "minValue": 0,
+        "show": false,
+        "thresholdLabels": false,
+        "thresholdMarkers": true
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 2,
+        "x": 18,
         "y": 0
       },
-      "id": 13,
+      "id": 37,
       "interval": null,
       "links": [],
       "mappingType": 1,
@@ -277,21 +567,21 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "sum(ALERTS)",
+          "expr": "sum(up{job=~\"Riot.*\"})",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
         }
       ],
-      "thresholds": "0,1",
-      "title": "Alerts",
+      "thresholds": "1,1",
+      "title": "Riot",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [
         {
           "op": "=",
           "text": "N/A",
-          "value": "0"
+          "value": "null"
         }
       ],
       "valueName": "avg"
@@ -306,7 +596,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 7
+        "y": 3
       },
       "id": 30,
       "legend": {
@@ -322,6 +612,7 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "paceLength": 10,
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -334,6 +625,7 @@
         {
           "expr": "sum(node_load1) by (job)",
           "format": "time_series",
+          "hide": false,
           "intervalFactor": 1,
           "legendFormat": "{{job}}-load1",
           "refId": "A"
@@ -341,6 +633,7 @@
         {
           "expr": "sum(node_load5) by (job)",
           "format": "time_series",
+          "hide": true,
           "intervalFactor": 1,
           "legendFormat": "{{job}}-load5",
           "refId": "B"
@@ -348,6 +641,7 @@
         {
           "expr": "sum(node_load15) by (job)",
           "format": "time_series",
+          "hide": true,
           "intervalFactor": 1,
           "legendFormat": "{{job}}-load15",
           "refId": "C"
@@ -411,7 +705,7 @@
         "h": 9,
         "w": 12,
         "x": 12,
-        "y": 7
+        "y": 3
       },
       "id": 28,
       "legend": {
@@ -427,6 +721,7 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "paceLength": 10,
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -446,18 +741,12 @@
           "refId": "A"
         },
         {
-          "expr": "sum(node_filesystem_size_bytes - node_filesystem_avail_bytes) by (job)",
+          "expr": "sum(node_filesystem_size_bytes{job=~\"Qed.*\"} - node_filesystem_avail_bytes{job=~\"Qed.*\"}) by (job)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
-          "legendFormat": "Free {{job}}",
+          "legendFormat": "Used {{job}}",
           "refId": "B"
-        },
-        {
-          "expr": "",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "refId": "C"
         }
       ],
       "thresholds": [],
@@ -516,7 +805,7 @@
         "h": 9,
         "w": 12,
         "x": 0,
-        "y": 16
+        "y": 12
       },
       "id": 27,
       "legend": {
@@ -532,6 +821,7 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "paceLength": 10,
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -551,7 +841,7 @@
           "refId": "A"
         },
         {
-          "expr": "sum(node_memory_MemTotal_bytes{job=~\"Agent.*\"})/(sum(qed_auditor_instances_count)+sum(qed_monitor_instances_count)+sum(qed_publisher_instances_count))",
+          "expr": "15*1024*1024*1024",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Max-Agent",
@@ -623,7 +913,7 @@
         "h": 9,
         "w": 12,
         "x": 12,
-        "y": 16
+        "y": 12
       },
       "id": 25,
       "legend": {
@@ -639,6 +929,7 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "paceLength": 10,
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -710,7 +1001,7 @@
     }
   ],
   "refresh": "10s",
-  "schemaVersion": 16,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": [
     "prometheus, ",
@@ -789,7 +1080,7 @@
     ]
   },
   "time": {
-    "from": "now-1h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {
@@ -821,4 +1112,4 @@
   "title": "Hosts Monitoring",
   "uid": "64nrElFmk",
   "version": 1
-}
+}
\ No newline at end of file
diff --git a/deploy/aws/provision/files/grafana/dashboards/QED.json b/deploy/aws/provision/files/grafana/dashboards/QED.json
index 65ce9228d..275c95c91 100644
--- a/deploy/aws/provision/files/grafana/dashboards/QED.json
+++ b/deploy/aws/provision/files/grafana/dashboards/QED.json
@@ -15,7 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 2,
-  "iteration": 1553782676664,
+  "id": 3,
+  "iteration": 1553863181459,
   "links": [],
   "panels": [
     {
@@ -1198,7 +1199,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(qed_monitor_batches_received_total{job=~\"Agent-Monitor.*\"}[$interval])) by (job)",
+          "expr": "sum(rate(qed_monitor_batches_received_total{job=~\"Monitor.*\"}[$interval])) by (job)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
@@ -1206,7 +1207,7 @@
           "refId": "A"
         },
         {
-          "expr": "sum(rate(qed_auditor_batches_received_total{job=~\"Agent-Auditor.*\"}[$interval])) by (job)",
+          "expr": "sum(rate(qed_auditor_batches_received_total{job=~\"Auditor.*\"}[$interval])) by (job)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
@@ -1214,7 +1215,7 @@
           "refId": "B"
         },
         {
-          "expr": "sum(rate(qed_publisher_batches_received_total{job=~\"Agent-Publisher.*\"}[$interval])) by (job)",
+          "expr": "sum(rate(qed_publisher_batches_received_total{job=~\"Publisher.*\"}[$interval])) by (job)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
@@ -1222,7 +1223,7 @@
           "refId": "C"
         },
         {
-          "expr": "qed_monitor_batches_received_total{job=~\"Agent-Monitor.*\"}",
+          "expr": "qed_monitor_batches_received_total{job=~\"Monitor.*\"}",
           "format": "time_series",
           "hide": true,
           "intervalFactor": 1,
@@ -1308,21 +1309,21 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(rate(qed_monitor_batches_process_seconds{job=~\"Agent-Monitor.*\"}[$interval])) by (job)",
+          "expr": "sum(rate(qed_monitor_batches_process_seconds{job=~\"Monitor.*\"}[$interval])) by (job)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{job}}",
           "refId": "A"
         },
         {
-          "expr": "sum(rate(qed_auditor_batches_process_seconds{job=~\"Agent-Auditor.*\"}[$interval])) by (job)",
+          "expr": "sum(rate(qed_auditor_batches_process_seconds{job=~\"Auditor.*\"}[$interval])) by (job)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{job}}",
           "refId": "B"
         },
         {
-          "expr": "sum(rate(qed_publisher_batches_process_seconds{job=~\"Agent-Publisher.*\"}[$interval])) by (job)",
+          "expr": "sum(rate(qed_publisher_batches_process_seconds{job=~\"Publisher.*\"}[$interval])) by (job)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{job}}",
@@ -1622,86 +1623,6 @@
         }
       ],
       "valueName": "delta"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 5,
-        "w": 4,
-        "x": 15,
-        "y": 41
-      },
-      "id": 35,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "sum(qed_store_alerts_generated_total)",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "{{job}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "title": "Alerts",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "delta"
     }
   ],
   "refresh": "5s",
diff --git a/deploy/aws/provision/files/grafana/dashboards/Storage.json b/deploy/aws/provision/files/grafana/dashboards/Storage.json
new file mode 100644
index 000000000..36dc89347
--- /dev/null
+++ b/deploy/aws/provision/files/grafana/dashboards/Storage.json
@@ -0,0 +1,246 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 0,
+    "id": 4,
+    "links": [],
+    "panels": [
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "fill": 1,
+        "gridPos": {
+          "h": 9,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 2,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "paceLength": 10,
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "sum(qed_storage_io_bytes_read) by (job)",
+            "format": "time_series",
+            "interval": "",
+            "intervalFactor": 1,
+            "legendFormat": "read_{{job}}",
+            "refId": "A"
+          },
+          {
+            "expr": "sum(qed_storage_io_bytes_written) by (job)",
+            "format": "time_series",
+            "intervalFactor": 1,
+            "legendFormat": "write_{{job}}",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "IO bytes",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "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
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "fill": 1,
+        "gridPos": {
+          "h": 9,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "id": 3,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "paceLength": 10,
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "sum(qed_storage_block_cache_hit) by (job)",
+            "format": "time_series",
+            "interval": "",
+            "intervalFactor": 1,
+            "legendFormat": "hits_{{job}}",
+            "refId": "A"
+          },
+          {
+            "expr": "sum(qed_storage_block_cache_miss) by (job)",
+            "format": "time_series",
+            "intervalFactor": 1,
+            "legendFormat": "miss_{{job}}",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Block cache",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "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
+        }
+      }
+    ],
+    "refresh": "5s",
+    "schemaVersion": 18,
+    "style": "dark",
+    "tags": [],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-5m",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ]
+    },
+    "timezone": "",
+    "title": "Storage",
+    "uid": "gD89TI6mz",
+    "version": 1
+  }
\ No newline at end of file
diff --git a/deploy/aws/provision/tasks/common/build.yml b/deploy/aws/provision/tasks/common/build.yml
index 9690d1a4e..5eedf1c95 100644
--- a/deploy/aws/provision/tasks/common/build.yml
+++ b/deploy/aws/provision/tasks/common/build.yml
@@ -17,7 +17,7 @@
       path: config_files/bin
       state: directory
 
-- name: Build QED, Inmemory Storage and Riot on Linux
+- name: Build QED, Inmemory Storage and Riot binaries for Linux, on Linux
   shell: > 
     go build -o {{ item }}
   with_items:
@@ -26,7 +26,7 @@
     - config_files/bin/riot ../../../tests/riot.go
   when: ansible_system == 'Linux'
 
-- name: Build QED, Inmemory Storage and Riot on MacOS
+- name: Build QED, Inmemory Storage and Riot binaries for Linux, on MacOS
   shell: >
     {{ item }}
   with_items:
diff --git a/deploy/aws/provision/tasks/prometheus/main.yml b/deploy/aws/provision/tasks/prometheus/main.yml
index d5e38c814..4c00c2a47 100644
--- a/deploy/aws/provision/tasks/prometheus/main.yml
+++ b/deploy/aws/provision/tasks/prometheus/main.yml
@@ -95,6 +95,7 @@
     - dashboards/dashboard.yml
     - dashboards/Host.json
     - dashboards/QED.json
+    - dashboards/Storage.json
   register: grafana_config
 
 - name: Restart Grafana