diff --git a/Docker/files/grafana/xmrauctions_metrics.json b/Docker/files/grafana/xmrauctions_metrics.json
index a07c1ab..296f6c7 100644
--- a/Docker/files/grafana/xmrauctions_metrics.json
+++ b/Docker/files/grafana/xmrauctions_metrics.json
@@ -61,7 +61,8 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "GET - prometheus-django-metrics",
+          "alias": "/.*prometheus.*/",
+          "fill": 0,
           "hideTooltip": true,
           "legend": false,
           "lines": false
@@ -72,9 +73,9 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(django_http_requests_total_by_view_transport_method_total[1m]) * 60",
-          "instant": false,
-          "legendFormat": "{{ method }} - {{ view }}",
+          "expr": "rate(django_http_responses_total_by_status_view_method_total[1m]) * 60",
+          "hide": false,
+          "legendFormat": "{{ status }} -  {{ method }} - {{ view }} ",
           "refId": "A"
         }
       ],
@@ -82,7 +83,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Requests by Method/View",
+      "title": "Responses by Status/Method/View",
       "tooltip": {
         "shared": true,
         "sort": 2,
@@ -134,13 +135,13 @@
         "y": 0
       },
       "hiddenSeries": false,
-      "id": 6,
+      "id": 12,
       "legend": {
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
-        "show": true,
+        "show": false,
         "total": false,
         "values": false
       },
@@ -156,8 +157,12 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "Unapplied",
-          "color": "#F2495C"
+          "alias": "django",
+          "color": "#5794F2"
+        },
+        {
+          "alias": "prometheus",
+          "color": "#FF9830"
         }
       ],
       "spaceLength": 10,
@@ -165,21 +170,16 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "job:django_migrations_applied_total:max",
-          "legendFormat": "Applied",
+          "expr": "rate(process_cpu_seconds_total[1m]) * 100",
+          "legendFormat": "{{ job }}",
           "refId": "A"
-        },
-        {
-          "expr": "job:django_migrations_unapplied_total:max",
-          "legendFormat": "Unapplied",
-          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "DB Migrations",
+      "title": "Estimated CPU",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -235,7 +235,7 @@
       "id": 8,
       "legend": {
         "alignAsTable": true,
-        "avg": true,
+        "avg": false,
         "current": false,
         "hideEmpty": true,
         "hideZero": true,
@@ -246,7 +246,7 @@
         "sort": "avg",
         "sortDesc": true,
         "total": false,
-        "values": true
+        "values": false
       },
       "lines": true,
       "linewidth": 1,
@@ -260,7 +260,7 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "GET - prometheus-django-metrics",
+          "alias": "/.*prometheus.*/",
           "fill": 0,
           "hideTooltip": true,
           "legend": false,
@@ -273,6 +273,7 @@
       "targets": [
         {
           "expr": "rate(django_http_requests_latency_seconds_by_view_method_sum{job=\"django\"}[1m])",
+          "hide": false,
           "legendFormat": "{{ method }} - {{ view }}",
           "refId": "A"
         }
@@ -333,13 +334,13 @@
         "y": 8
       },
       "hiddenSeries": false,
-      "id": 4,
+      "id": 6,
       "legend": {
         "avg": false,
         "current": false,
         "max": false,
         "min": false,
-        "show": false,
+        "show": true,
         "total": false,
         "values": false
       },
@@ -355,8 +356,8 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "DB Connections",
-          "color": "#B877D9"
+          "alias": "Unapplied",
+          "color": "#F2495C"
         }
       ],
       "spaceLength": 10,
@@ -364,17 +365,21 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(django_db_new_connections_total[1m]) * 60",
-          "instant": false,
-          "legendFormat": "DB Connections",
+          "expr": "job:django_migrations_applied_total:max",
+          "legendFormat": "Applied",
           "refId": "A"
+        },
+        {
+          "expr": "job:django_migrations_unapplied_total:max",
+          "legendFormat": "Unapplied",
+          "refId": "B"
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "DB Connections",
+      "title": "DB Migrations",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -390,8 +395,8 @@
       },
       "yaxes": [
         {
-          "format": "none",
-          "label": "",
+          "format": "short",
+          "label": null,
           "logBase": 1,
           "max": null,
           "min": null,
@@ -403,7 +408,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": false
+          "show": true
         }
       ],
       "yaxis": {
@@ -422,7 +427,7 @@
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 7,
+        "h": 8,
         "w": 19,
         "x": 0,
         "y": 16
@@ -478,7 +483,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "DB Operations",
+      "title": "DB Model Operations",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -524,13 +529,13 @@
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
-        "h": 7,
+        "h": 8,
         "w": 5,
         "x": 19,
         "y": 16
       },
       "hiddenSeries": false,
-      "id": 12,
+      "id": 4,
       "legend": {
         "avg": false,
         "current": false,
@@ -552,12 +557,101 @@
       "renderer": "flot",
       "seriesOverrides": [
         {
-          "alias": "django",
-          "color": "#5794F2"
+          "alias": "DB Connections",
+          "color": "#B877D9"
+        }
+      ],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(django_db_new_connections_total[1m]) * 60",
+          "instant": false,
+          "legendFormat": "DB Connections",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "DB Connections",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "none",
+          "label": "",
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
         },
         {
-          "alias": "prometheus",
-          "color": "#FF9830"
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 7,
+        "w": 19,
+        "x": 0,
+        "y": 24
+      },
+      "hiddenSeries": false,
+      "id": 14,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [
+        {
+          "alias": "/.*/",
+          "color": "#5794F2"
         }
       ],
       "spaceLength": 10,
@@ -565,8 +659,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "rate(process_cpu_seconds_total[1m]) * 100",
-          "legendFormat": "{{ job }}",
+          "expr": "rate(django_db_execute_total[1m])",
           "refId": "A"
         }
       ],
@@ -574,7 +667,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "Estimated CPU",
+      "title": "DB Executions",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -603,7 +696,7 @@
           "logBase": 1,
           "max": null,
           "min": null,
-          "show": true
+          "show": false
         }
       ],
       "yaxis": {
@@ -612,7 +705,7 @@
       }
     }
   ],
-  "refresh": "1m",
+  "refresh": "10s",
   "schemaVersion": 21,
   "style": "dark",
   "tags": [],
@@ -640,5 +733,5 @@
   "timezone": "browser",
   "title": "XMR Auctions",
   "uid": "pVe331UWk",
-  "version": 1
+  "version": 10
 }