diff --git a/roles/openshift-apps/monitor-dashboard/templates/configmap.yml b/roles/openshift-apps/monitor-dashboard/templates/configmap.yml
index fd1c5fb316..c5da5b4879 100644
--- a/roles/openshift-apps/monitor-dashboard/templates/configmap.yml
+++ b/roles/openshift-apps/monitor-dashboard/templates/configmap.yml
@@ -13,11 +13,11 @@ data:
         type: postgres
         url: db-datanommer01.iad2.fedoraproject.org:5432
         database: datanommer
-        default: true
         user: datanommer_ro
         secureJsonData:
           password: {{ datanommer_ro_password }}
         jsonData:
+          default: true
           sslmode: "disable" # disable/require/verify-ca/verify-full
           maxOpenConns: 0         # Grafana v5.4+
           maxIdleConns: 2         # Grafana v5.4+
diff --git a/roles/openshift-apps/monitor-dashboard/templates/dashboard_anitya.json.j2 b/roles/openshift-apps/monitor-dashboard/templates/dashboard_anitya.json.j2
index 890126076c..4580515884 100644
--- a/roles/openshift-apps/monitor-dashboard/templates/dashboard_anitya.json.j2
+++ b/roles/openshift-apps/monitor-dashboard/templates/dashboard_anitya.json.j2
@@ -23,7 +23,7 @@
         "bars": false,
         "dashLength": 10,
         "dashes": false,
-        "datasource": null,
+        "datasource": "Datanommer",
         "description": "",
         "fieldConfig": {
           "defaults": {
@@ -139,7 +139,7 @@
         "bars": false,
         "dashLength": 10,
         "dashes": false,
-        "datasource": null,
+        "datasource": "Datanommer",
         "fieldConfig": {
           "defaults": {
             "custom": {},
diff --git a/roles/openshift-apps/monitor-dashboard/templates/dashboard_monitor_gating.json.j2 b/roles/openshift-apps/monitor-dashboard/templates/dashboard_monitor_gating.json.j2
index 5690ec73e1..0fc5c1a035 100644
--- a/roles/openshift-apps/monitor-dashboard/templates/dashboard_monitor_gating.json.j2
+++ b/roles/openshift-apps/monitor-dashboard/templates/dashboard_monitor_gating.json.j2
@@ -20,7 +20,7 @@
   "links": [],
   "panels": [
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -74,7 +74,7 @@
       "type": "text"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "Percentage of successful runs (as noted by monitor-gating sending org.fedoraproject.prod.monitor-gating.$test.end.success message) out of all of org.fedoraproject.prod.monitor-gating.$test.end.* messages ",
       "fieldConfig": {
         "defaults": {
@@ -152,7 +152,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "Percentage of runs that reached the step in the build where the package was successfully cloned, its version was bumped and it was pushed again.",
       "fieldConfig": {
         "defaults": {
@@ -230,7 +230,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "Percentage of runs that reached the step of Koji successfully finishing the package build.",
       "fieldConfig": {
         "defaults": {
@@ -307,7 +307,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "Percentage of runs that successfuly reached the step of initial creation of the update in Bodhi",
       "fieldConfig": {
         "defaults": {
@@ -385,7 +385,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "Percentage of runs, where it reached the notification for the test failing in CI in a given time-limit.",
       "fieldConfig": {
         "defaults": {
@@ -463,7 +463,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "Percentage of runs where resultsdb send out the notification for learning about the result in the given time-limit.",
       "fieldConfig": {
         "defaults": {
@@ -541,7 +541,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "Percentage of runs that reached the Greenwave gating a release of a backage based on a failed CI run",
       "fieldConfig": {
         "defaults": {
@@ -619,7 +619,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "Percentage of runs successfully waived",
       "fieldConfig": {
         "defaults": {
@@ -697,7 +697,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {},
@@ -771,7 +771,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -847,7 +847,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -923,7 +923,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -999,7 +999,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -1075,7 +1075,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -1151,7 +1151,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -1227,7 +1227,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -1304,7 +1304,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {},
@@ -1378,7 +1378,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -1455,7 +1455,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -1531,7 +1531,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -1607,7 +1607,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -1685,7 +1685,7 @@
       "type": "gauge"
     },
     {
-      "datasource": null,
+      "datasource": "Datanommer",
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -1766,7 +1766,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {}
@@ -1878,7 +1878,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -2006,7 +2006,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -2134,7 +2134,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -2262,7 +2262,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -2390,7 +2390,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": null,
+      "datasource": "Datanommer",
       "fieldConfig": {
         "defaults": {
           "custom": {
diff --git a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml
index 2877020a32..59e4d4d22e 100644
--- a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml
@@ -41,7 +41,7 @@ spec:
             - name: 'GF_USERS_AUTO_ASSIGN_ORG_ROLE'
               value: 'Admin'
             - name: 'V'
-              value: '5'
+              value: '6'
           image: registry.hub.docker.com/grafana/grafana:latest
           name: dashboard
           ports: