diff --git a/plugins/datasource-zabbix/directives.js b/plugins/datasource-zabbix/directives.js
index 071d4be..8d274f5 100644
--- a/plugins/datasource-zabbix/directives.js
+++ b/plugins/datasource-zabbix/directives.js
@@ -7,15 +7,15 @@ define([
     var module = angular.module('grafana.directives');
 
     module.directive('metricQueryEditorZabbix', function() {
-      return {controller: 'ZabbixAPIQueryCtrl', templateUrl: 'app/plugins/datasource/zabbix/partials/query.editor.html'};
+      return {controller: 'ZabbixAPIQueryCtrl', templateUrl: 'public/plugins/zabbix/partials/query.editor.html'};
     });
 
     module.directive('metricQueryOptionsZabbix', function() {
-      return {templateUrl: 'app/plugins/datasource/zabbix/partials/query.options.html'};
+      return {templateUrl: 'public/plugins/zabbix/partials/query.options.html'};
     });
 
     module.directive('annotationsQueryEditorZabbix', function() {
-      return {templateUrl: 'app/plugins/datasource/zabbix/partials/annotations.editor.html'};
+      return {templateUrl: 'public/plugins/zabbix/partials/annotations.editor.html'};
     });
 
   });
diff --git a/plugins/datasource-zabbix/plugin.json b/plugins/datasource-zabbix/plugin.json
index b5a3489..fac427d 100644
--- a/plugins/datasource-zabbix/plugin.json
+++ b/plugins/datasource-zabbix/plugin.json
@@ -5,10 +5,15 @@
   "type": "zabbix",
   "serviceName": "ZabbixAPIDatasource",
 
-  "module": "app/plugins/datasource/zabbix/datasource",
+  "module": "plugins/zabbix/datasource",
 
   "partials": {
-    "config": "app/plugins/datasource/zabbix/partials/config.html"
+    "config": "public/plugins/zabbix/partials/config.html"
+  },
+
+  "staticRoot": {
+    "url": "zabbix",
+    "path": "."
   },
 
   "metrics": true,
diff --git a/plugins/panel-triggers/module.js b/plugins/panel-triggers/module.js
index 34af1b7..84beb32 100644
--- a/plugins/panel-triggers/module.js
+++ b/plugins/panel-triggers/module.js
@@ -18,7 +18,7 @@ define([
   'jquery',
   'app/core/config',
   'app/features/panel/panel_meta',
-  'app/plugins/datasource/zabbix/helperFunctions',
+  '../zabbix/helperFunctions',
 ],
 function (angular, app, _, $, config, PanelMeta) {
   'use strict';
@@ -29,7 +29,7 @@ function (angular, app, _, $, config, PanelMeta) {
   module.directive('grafanaPanelTriggers', function() {
     return {
       controller: 'TriggersPanelCtrl',
-      templateUrl: 'app/plugins/panels/triggers/module.html',
+      templateUrl: 'public/plugins/triggers/module.html',
     };
   });
 
@@ -42,7 +42,7 @@ function (angular, app, _, $, config, PanelMeta) {
       fullscreen: true,
     });
 
-    $scope.panelMeta.addEditorTab('Options', 'app/plugins/panels/triggers/editor.html');
+    $scope.panelMeta.addEditorTab('Options', 'public/plugins/triggers/editor.html');
 
     $scope.ackFilters = [
       'all triggers',
@@ -257,7 +257,7 @@ function (angular, app, _, $, config, PanelMeta) {
       popoverSrv.show({
         element: el,
         placement: 'top',
-        templateUrl:  'app/plugins/panels/triggers/trigger.colorpicker.html',
+        templateUrl:  'public/plugins/triggers/trigger.colorpicker.html',
         scope: popoverScope
       });
     };
diff --git a/plugins/panel-triggers/plugin.json b/plugins/panel-triggers/plugin.json
index 3f50686..db5b6b4 100644
--- a/plugins/panel-triggers/plugin.json
+++ b/plugins/panel-triggers/plugin.json
@@ -4,5 +4,10 @@
   "name": "Zabbix triggers",
   "type": "triggers",
 
-  "module": "app/plugins/panels/triggers/module"
+  "module": "plugins/triggers/module",
+
+  "staticRoot": {
+    "url": "triggers",
+    "path": "."
+  }
 }