diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
index 99fd90c..e2bee73 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
@@ -29,8 +29,10 @@ class plugin_zabbix::params {
 
   if versioncmp($zabbix_version, '2.4') < 0 {
     $zabbix_includes = $zabbix_extra_conf_dir
+    $zabbix_trigger_exp_not_equal = '#'
   } else {
     $zabbix_includes = "${zabbix_extra_conf_dir}/*.conf"
+    $zabbix_trigger_exp_not_equal = '&lt;&gt;'
   }
 
   $zabbix_ports = {
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/server/config.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/server/config.pp
index 53adf0e..9bd55ec 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/server/config.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/server/config.pp
@@ -34,6 +34,18 @@ class plugin_zabbix::server::config {
     source  => 'puppet:///modules/plugin_zabbix/import'
   }
 
+  file { '/etc/zabbix/import/Template_App_MySQL.xml':
+    ensure  => present,
+    require => File['/etc/zabbix/import'],
+    content => template('plugin_zabbix/Template_App_MySQL.xml.erb'),
+  }
+
+  file { '/etc/zabbix/import/Template_App_OpenStack_Ceph_Cluster.xml':
+    ensure  => present,
+    require => File['/etc/zabbix/import'],
+    content => template('plugin_zabbix/Template_App_OpenStack_Ceph_Cluster.xml.erb'),
+  }
+
   Plugin_zabbix_configuration_import {
     require => File['/etc/zabbix/import'],
   }
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_MySQL.xml b/deployment_scripts/puppet/modules/plugin_zabbix/templates/Template_App_MySQL.xml.erb
similarity index 99%
rename from deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_MySQL.xml
rename to deployment_scripts/puppet/modules/plugin_zabbix/templates/Template_App_MySQL.xml.erb
index c2900da..ff6213c 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_MySQL.xml
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/templates/Template_App_MySQL.xml.erb
@@ -762,7 +762,7 @@ It requires user parameter mysql.status[*], which is defined in userparameter_my
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App MySQL:db.wsrep.connected.query.last(0)}&lt;&gt;1</expression>
+            <expression>{Template App MySQL:db.wsrep.connected.query.last(0)}<%= scope.lookupvar('plugin_zabbix::params::zabbix_trigger_exp_not_equal') %>1</expression>
             <name>MySQL is not connected to the cluster</name>
             <url/>
             <status>0</status>
@@ -772,7 +772,7 @@ It requires user parameter mysql.status[*], which is defined in userparameter_my
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App MySQL:db.wsrep.ready.query.last(0)}&lt;&gt;1</expression>
+            <expression>{Template App MySQL:db.wsrep.ready.query.last(0)}<%= scope.lookupvar('plugin_zabbix::params::zabbix_trigger_exp_not_equal') %>1</expression>
             <name>MySQL is not ready to rejoin cluster</name>
             <url/>
             <status>0</status>
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_OpenStack_Ceph_Cluster.xml b/deployment_scripts/puppet/modules/plugin_zabbix/templates/Template_App_OpenStack_Ceph_Cluster.xml.erb
similarity index 99%
rename from deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_OpenStack_Ceph_Cluster.xml
rename to deployment_scripts/puppet/modules/plugin_zabbix/templates/Template_App_OpenStack_Ceph_Cluster.xml.erb
index c286400..11f368d 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/files/import/Template_App_OpenStack_Ceph_Cluster.xml
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/templates/Template_App_OpenStack_Ceph_Cluster.xml.erb
@@ -1719,7 +1719,7 @@
             <dependencies/>
         </trigger>
         <trigger>
-            <expression>{Template App OpenStack Ceph Cluster:probe.ceph.last()}&lt;&gt;0</expression>
+            <expression>{Template App OpenStack Ceph Cluster:probe.ceph.last()}<%= scope.lookupvar('plugin_zabbix::params::zabbix_trigger_exp_not_equal') %>0</expression>
             <name>Cannot retrieve Ceph metrics form {HOST.NAME1} node</name>
             <url/>
             <status>0</status>