diff --git a/CHANGELOG.md b/CHANGELOG.md
index 746e388..88f602f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Template query format. New format is `{group}{host}{app}{item}`. It allows to use names with dot. Updated 
   [templating docs](http://docs.grafana-zabbix.org/guides/templating/#query-format), 
   [#254](https://github.com/alexanderzobnin/grafana-zabbix/issues/254)
+- Update included dashboards. Add templated zabbix datasource and use it for all metrics.
 
 ## [3.4.0] - 2017-05-17
 ### Added
diff --git a/dist/dashboards/template_linux_server.json b/dist/dashboards/template_linux_server.json
index 3cb9afa..338a363 100644
--- a/dist/dashboards/template_linux_server.json
+++ b/dist/dashboards/template_linux_server.json
@@ -24,7 +24,7 @@
             "CPU user time": "#EAB839"
           },
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 3,
@@ -109,7 +109,7 @@
             "Processor load (1 min average per core)": "#1F78C1"
           },
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -201,7 +201,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 3,
@@ -300,7 +300,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 3,
@@ -434,56 +434,28 @@
   },
   "templating": {
     "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "label": "Zabbix Data Source",
+        "name": "datasource",
+        "options": [],
+        "query": "alexanderzobnin-zabbix-datasource",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      },
       {
         "allFormat": "regex values",
-        "current": {
-          "text": "Frontend",
-          "value": "Frontend"
-        },
-        "datasource": null,
+        "current": {},
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "Group",
         "multi": false,
         "multiFormat": "glob",
         "name": "group",
-        "options": [
-          {
-            "text": "Backend",
-            "value": "Backend",
-            "selected": false
-          },
-          {
-            "text": "Database servers",
-            "value": "Database servers",
-            "selected": false
-          },
-          {
-            "text": "Frontend",
-            "value": "Frontend",
-            "selected": true
-          },
-          {
-            "text": "Linux servers",
-            "value": "Linux servers",
-            "selected": false
-          },
-          {
-            "text": "Network",
-            "value": "Network",
-            "selected": false
-          },
-          {
-            "text": "Workstations",
-            "value": "Workstations",
-            "selected": false
-          },
-          {
-            "text": "Zabbix servers",
-            "value": "Zabbix servers",
-            "selected": false
-          }
-        ],
+        "options": [],
         "query": "*",
         "refresh": 1,
         "refresh_on_load": false,
@@ -492,29 +464,15 @@
       },
       {
         "allFormat": "glob",
-        "current": {
-          "text": "frontend01",
-          "value": "frontend01"
-        },
-        "datasource": null,
+        "current": {},
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "Host",
         "multi": false,
         "multiFormat": "glob",
         "name": "host",
-        "options": [
-          {
-            "text": "frontend01",
-            "value": "frontend01",
-            "selected": true
-          },
-          {
-            "text": "frontend02",
-            "value": "frontend02",
-            "selected": false
-          }
-        ],
+        "options": [],
         "query": "$group.*",
         "refresh": 1,
         "refresh_on_load": false,
@@ -523,11 +481,8 @@
       },
       {
         "allFormat": "regex values",
-        "current": {
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": null,
+        "current": {},
+        "datasource": "$datasource",
         "hide": 0,
         "hideLabel": false,
         "includeAll": true,
@@ -535,23 +490,7 @@
         "multi": true,
         "multiFormat": "regex values",
         "name": "netif",
-        "options": [
-          {
-            "text": "All",
-            "value": "$__all",
-            "selected": true
-          },
-          {
-            "text": "eth0",
-            "value": "eth0",
-            "selected": false
-          },
-          {
-            "text": "eth1",
-            "value": "eth1",
-            "selected": false
-          }
-        ],
+        "options": [],
         "query": "*.$host.Network interfaces.*",
         "refresh": 1,
         "refresh_on_load": false,
@@ -564,6 +503,6 @@
     "list": []
   },
   "schemaVersion": 12,
-  "version": 8,
+  "version": 9,
   "links": []
 }
diff --git a/dist/dashboards/zabbix_server_dashboard.json b/dist/dashboards/zabbix_server_dashboard.json
index b9a8cb0..9f92024 100644
--- a/dist/dashboards/zabbix_server_dashboard.json
+++ b/dist/dashboards/zabbix_server_dashboard.json
@@ -26,7 +26,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "format": "none",
@@ -89,7 +89,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "decimals": 0,
           "editable": true,
           "error": false,
@@ -153,7 +153,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "format": "none",
@@ -218,7 +218,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -327,6 +327,7 @@
               "value": "avg"
             }
           ],
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fontSize": "100%",
@@ -423,7 +424,7 @@
               "functions": []
             }
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "renderer": "flot",
           "yaxes": [
             {
@@ -530,7 +531,7 @@
               "functions": []
             }
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "renderer": "flot",
           "yaxes": [
             {
@@ -592,6 +593,21 @@
       ]
     }
   ],
+  "templating": {
+    "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "label": "Zabbix Data Source",
+        "name": "datasource",
+        "options": [],
+        "query": "alexanderzobnin-zabbix-datasource",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      }
+    ]
+  },
   "time": {
     "from": "now-6h",
     "to": "now"
@@ -621,13 +637,10 @@
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
   "annotations": {
     "list": []
   },
   "schemaVersion": 12,
-  "version": 6,
+  "version": 7,
   "links": []
 }
diff --git a/src/dashboards/template_linux_server.json b/src/dashboards/template_linux_server.json
index 3cb9afa..338a363 100644
--- a/src/dashboards/template_linux_server.json
+++ b/src/dashboards/template_linux_server.json
@@ -24,7 +24,7 @@
             "CPU user time": "#EAB839"
           },
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 3,
@@ -109,7 +109,7 @@
             "Processor load (1 min average per core)": "#1F78C1"
           },
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -201,7 +201,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 3,
@@ -300,7 +300,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 3,
@@ -434,56 +434,28 @@
   },
   "templating": {
     "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "label": "Zabbix Data Source",
+        "name": "datasource",
+        "options": [],
+        "query": "alexanderzobnin-zabbix-datasource",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      },
       {
         "allFormat": "regex values",
-        "current": {
-          "text": "Frontend",
-          "value": "Frontend"
-        },
-        "datasource": null,
+        "current": {},
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "Group",
         "multi": false,
         "multiFormat": "glob",
         "name": "group",
-        "options": [
-          {
-            "text": "Backend",
-            "value": "Backend",
-            "selected": false
-          },
-          {
-            "text": "Database servers",
-            "value": "Database servers",
-            "selected": false
-          },
-          {
-            "text": "Frontend",
-            "value": "Frontend",
-            "selected": true
-          },
-          {
-            "text": "Linux servers",
-            "value": "Linux servers",
-            "selected": false
-          },
-          {
-            "text": "Network",
-            "value": "Network",
-            "selected": false
-          },
-          {
-            "text": "Workstations",
-            "value": "Workstations",
-            "selected": false
-          },
-          {
-            "text": "Zabbix servers",
-            "value": "Zabbix servers",
-            "selected": false
-          }
-        ],
+        "options": [],
         "query": "*",
         "refresh": 1,
         "refresh_on_load": false,
@@ -492,29 +464,15 @@
       },
       {
         "allFormat": "glob",
-        "current": {
-          "text": "frontend01",
-          "value": "frontend01"
-        },
-        "datasource": null,
+        "current": {},
+        "datasource": "$datasource",
         "hide": 0,
         "includeAll": false,
         "label": "Host",
         "multi": false,
         "multiFormat": "glob",
         "name": "host",
-        "options": [
-          {
-            "text": "frontend01",
-            "value": "frontend01",
-            "selected": true
-          },
-          {
-            "text": "frontend02",
-            "value": "frontend02",
-            "selected": false
-          }
-        ],
+        "options": [],
         "query": "$group.*",
         "refresh": 1,
         "refresh_on_load": false,
@@ -523,11 +481,8 @@
       },
       {
         "allFormat": "regex values",
-        "current": {
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": null,
+        "current": {},
+        "datasource": "$datasource",
         "hide": 0,
         "hideLabel": false,
         "includeAll": true,
@@ -535,23 +490,7 @@
         "multi": true,
         "multiFormat": "regex values",
         "name": "netif",
-        "options": [
-          {
-            "text": "All",
-            "value": "$__all",
-            "selected": true
-          },
-          {
-            "text": "eth0",
-            "value": "eth0",
-            "selected": false
-          },
-          {
-            "text": "eth1",
-            "value": "eth1",
-            "selected": false
-          }
-        ],
+        "options": [],
         "query": "*.$host.Network interfaces.*",
         "refresh": 1,
         "refresh_on_load": false,
@@ -564,6 +503,6 @@
     "list": []
   },
   "schemaVersion": 12,
-  "version": 8,
+  "version": 9,
   "links": []
 }
diff --git a/src/dashboards/zabbix_server_dashboard.json b/src/dashboards/zabbix_server_dashboard.json
index b9a8cb0..9f92024 100644
--- a/src/dashboards/zabbix_server_dashboard.json
+++ b/src/dashboards/zabbix_server_dashboard.json
@@ -26,7 +26,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "format": "none",
@@ -89,7 +89,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "decimals": 0,
           "editable": true,
           "error": false,
@@ -153,7 +153,7 @@
             "rgba(237, 129, 40, 0.89)",
             "rgba(50, 172, 45, 0.97)"
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "format": "none",
@@ -218,7 +218,7 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": null,
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fill": 1,
@@ -327,6 +327,7 @@
               "value": "avg"
             }
           ],
+          "datasource": "$datasource",
           "editable": true,
           "error": false,
           "fontSize": "100%",
@@ -423,7 +424,7 @@
               "functions": []
             }
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "renderer": "flot",
           "yaxes": [
             {
@@ -530,7 +531,7 @@
               "functions": []
             }
           ],
-          "datasource": null,
+          "datasource": "$datasource",
           "renderer": "flot",
           "yaxes": [
             {
@@ -592,6 +593,21 @@
       ]
     }
   ],
+  "templating": {
+    "list": [
+      {
+        "current": {},
+        "hide": 0,
+        "label": "Zabbix Data Source",
+        "name": "datasource",
+        "options": [],
+        "query": "alexanderzobnin-zabbix-datasource",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      }
+    ]
+  },
   "time": {
     "from": "now-6h",
     "to": "now"
@@ -621,13 +637,10 @@
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
   "annotations": {
     "list": []
   },
   "schemaVersion": 12,
-  "version": 6,
+  "version": 7,
   "links": []
 }