diff --git a/dockerfiles/monero_compile b/dockerfiles/monero_compile
index 6f2aa28..c94a250 100644
--- a/dockerfiles/monero_compile
+++ b/dockerfiles/monero_compile
@@ -1,5 +1,6 @@
 FROM ubuntu:20.04 as og
 
+ENV DEBIAN_FRONTEND noninteractive
 ARG threads
 
 WORKDIR /opt/monero
diff --git a/dockerfiles/monerod_exporter b/dockerfiles/monerod_exporter
index 2575bc3..d18c6d5 100644
--- a/dockerfiles/monerod_exporter
+++ b/dockerfiles/monerod_exporter
@@ -2,7 +2,7 @@ FROM node:8
 
 WORKDIR /opt/monerod_exporter
 
-RUN git clone https://github.com/ExcitableAardvark/monerod_exporter.git --branch=master --depth=1 .
+RUN git clone https://github.com/lalanza808/monerod_exporter.git --branch=master --depth=1 .
 
 RUN npm install
 
diff --git a/files/grafana/daemon_metrics.json b/files/grafana/daemon_metrics.json
index 89b967c..82b751b 100644
--- a/files/grafana/daemon_metrics.json
+++ b/files/grafana/daemon_metrics.json
@@ -24,11 +24,11 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fill": 1,
+      "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 9,
-        "w": 12,
+        "w": 18,
         "x": 0,
         "y": 0
       },
@@ -44,7 +44,7 @@
         "values": false
       },
       "lines": true,
-      "linewidth": 1,
+      "linewidth": 3,
       "nullPointMode": "connected",
       "options": {
         "dataLinks": []
@@ -67,6 +67,11 @@
           "expr": "avg(monerod_connections_outgoing)",
           "legendFormat": "Outgoing",
           "refId": "B"
+        },
+        {
+          "expr": "avg(monerod_rpc_connections_count)",
+          "legendFormat": "RPC",
+          "refId": "C"
         }
       ],
       "thresholds": [],
@@ -117,16 +122,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fill": 1,
+      "fill": 0,
       "fillGradient": 0,
       "gridPos": {
         "h": 9,
-        "w": 12,
-        "x": 12,
+        "w": 6,
+        "x": 18,
         "y": 0
       },
       "hiddenSeries": false,
-      "id": 2,
+      "id": 8,
       "legend": {
         "avg": false,
         "current": false,
@@ -144,20 +149,21 @@
       },
       "percentage": false,
       "pointradius": 2,
-      "points": false,
+      "points": true,
       "renderer": "flot",
       "seriesOverrides": [
         {
           "alias": "/.*/",
-          "color": "#C4162A"
+          "color": "#FA6400"
         }
       ],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": true,
+      "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(monerod_block_difficulty)",
+          "expr": "avg(monerod_block_reward)",
+          "legendFormat": "Block Reward (XMR)",
           "refId": "A"
         }
       ],
@@ -165,7 +171,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Difficulty",
+      "title": "Block Reward (XMR)",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -181,6 +187,7 @@
       },
       "yaxes": [
         {
+          "decimals": null,
           "format": "none",
           "label": null,
           "logBase": 1,
@@ -194,7 +201,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": true
+          "show": false
         }
       ],
       "yaxis": {
@@ -208,16 +215,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fill": 1,
+      "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 8,
+        "h": 9,
         "w": 12,
         "x": 0,
         "y": 9
       },
       "hiddenSeries": false,
-      "id": 8,
+      "id": 6,
       "legend": {
         "avg": false,
         "current": false,
@@ -235,21 +242,21 @@
       },
       "percentage": false,
       "pointradius": 2,
-      "points": false,
+      "points": true,
       "renderer": "flot",
       "seriesOverrides": [
         {
           "alias": "/.*/",
-          "color": "#FA6400"
+          "color": "#8F3BB8"
         }
       ],
       "spaceLength": 10,
       "stack": false,
-      "steppedLine": false,
+      "steppedLine": true,
       "targets": [
         {
-          "expr": "avg(monerod_block_reward)",
-          "legendFormat": "Block Reward (XMR)",
+          "expr": "avg(monerod_tx_mempool)",
+          "legendFormat": "Pool Transactions",
           "refId": "A"
         }
       ],
@@ -257,7 +264,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Block Reward (XMR)",
+      "title": "Mempool Transactions",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -273,8 +280,7 @@
       },
       "yaxes": [
         {
-          "decimals": null,
-          "format": "none",
+          "format": "short",
           "label": null,
           "logBase": 1,
           "max": null,
@@ -287,7 +293,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
@@ -301,16 +307,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fill": 1,
+      "fill": 0,
       "fillGradient": 0,
       "gridPos": {
-        "h": 8,
+        "h": 9,
         "w": 12,
         "x": 12,
         "y": 9
       },
       "hiddenSeries": false,
-      "id": 6,
+      "id": 2,
       "legend": {
         "avg": false,
         "current": false,
@@ -321,7 +327,7 @@
         "values": false
       },
       "lines": true,
-      "linewidth": 1,
+      "linewidth": 3,
       "nullPointMode": "connected",
       "options": {
         "dataLinks": []
@@ -333,7 +339,7 @@
       "seriesOverrides": [
         {
           "alias": "/.*/",
-          "color": "#8F3BB8"
+          "color": "#C4162A"
         }
       ],
       "spaceLength": 10,
@@ -341,8 +347,7 @@
       "steppedLine": true,
       "targets": [
         {
-          "expr": "avg(monerod_tx_mempool)",
-          "legendFormat": "Pool Transactions",
+          "expr": "avg(monerod_block_difficulty)",
           "refId": "A"
         }
       ],
@@ -350,7 +355,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Mempool Transactions",
+      "title": "Difficulty",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -365,6 +370,14 @@
         "values": []
       },
       "yaxes": [
+        {
+          "format": "none",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
         {
           "format": "short",
           "label": null,
@@ -372,6 +385,90 @@
           "max": null,
           "min": null,
           "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 8,
+        "w": 20,
+        "x": 0,
+        "y": 18
+      },
+      "hiddenSeries": false,
+      "id": 12,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 2,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [
+        {
+          "alias": "/.*/",
+          "color": "#1F60C4"
+        }
+      ],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "monerod_database_size",
+          "legendFormat": "Chain Size",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Chain Size",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "decbytes",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
         },
         {
           "format": "short",
@@ -408,10 +505,10 @@
         "thresholdMarkers": true
       },
       "gridPos": {
-        "h": 5,
-        "w": 8,
-        "x": 8,
-        "y": 17
+        "h": 8,
+        "w": 4,
+        "x": 20,
+        "y": 18
       },
       "id": 10,
       "interval": null,
@@ -482,7 +579,7 @@
     "list": []
   },
   "time": {
-    "from": "now-6h",
+    "from": "now-1h",
     "to": "now"
   },
   "timepicker": {
@@ -502,5 +599,5 @@
   "timezone": "",
   "title": "Daemon Stats",
   "uid": "0ktA4KDGk",
-  "version": 2
+  "version": 3
 }