diff --git a/src/README.md b/src/README.md
index 010b601..57f6e97 100644
--- a/src/README.md
+++ b/src/README.md
@@ -2,11 +2,9 @@
 Zabbix plugin allows to show different type of data from [Zabbix](http://www.zabbix.com/) 
 monitoring system.
 
-![Dashboard](https://cloud.githubusercontent.com/assets/4932851/8269101/9e6ee67e-17a3-11e5-85de-fe9dcc2dd375.png)
-
 ### Live Demo
 
-Check out the [live demo](http://play.grafana-zabbix.org/)
+Check out the [live demo](http://play.grafana-zabbix.org/) with dashboard examples.
 
 ### Features
 
diff --git a/src/dashboards/template_linux_server.json b/src/dashboards/template_linux_server.json
index b3bd6dc..3cb9afa 100644
--- a/src/dashboards/template_linux_server.json
+++ b/src/dashboards/template_linux_server.json
@@ -2,7 +2,10 @@
   "id": null,
   "title": "Template Linux Server",
   "originalTitle": "Template Linux Server",
-  "tags": [],
+  "tags": [
+    "zabbix",
+    "example"
+  ],
   "style": "dark",
   "timezone": "browser",
   "editable": true,
diff --git a/src/plugin.json b/src/plugin.json
index cf4a2ca..55d02c0 100644
--- a/src/plugin.json
+++ b/src/plugin.json
@@ -24,6 +24,13 @@
       {"name": "Docs", "url": "http://docs.grafana-zabbix.org"},
       {"name": "License", "url": "https://github.com/alexanderzobnin/grafana-zabbix/blob/master/LICENSE.md"}
     ],
+    "screenshots": [
+      {"name": "Showcase", "path": "https://cloud.githubusercontent.com/assets/4932851/8269101/9e6ee67e-17a3-11e5-85de-fe9dcc2dd375.png"}
+      {"name": "Dashboard", "path": "https://cloud.githubusercontent.com/assets/4932851/14539264/5ff70b58-0288-11e6-9de3-8aabe8c85e4c.png"}
+      {"name": "Annotations", "path": "https://cloud.githubusercontent.com/assets/4932851/14539263/5fd8abd6-0288-11e6-9c87-b960c654ab29.png"}
+      {"name": "Metric Editor", "path": "https://cloud.githubusercontent.com/assets/4932851/14539267/6004cb8a-0288-11e6-9b1f-78ec54409835.png"}
+      {"name": "Triggers", "path": "https://cloud.githubusercontent.com/assets/4932851/14539266/600495fc-0288-11e6-8d15-308bbef16535.png"}
+    ],
     "version": "3.0.0-beta6",
     "updated": "2016-04-13"
   },