diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
index bc3fc04..3b90331 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
@@ -91,6 +91,7 @@ class plugin_zabbix::params {
   #server parameters
   $vip_name                          = 'zbx_vip_mgmt'
   $server_ip                         = $network_metadata['vips'][$vip_name]['ipaddr']
+  $mgmt_vip                          = $network_metadata['vips']['management']['ipaddr']
   $server_config                     = '/etc/zabbix/zabbix_server.conf'
   $server_config_template            = 'plugin_zabbix/zabbix_server.conf.erb'
   $server_node_id                    = 0
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_agentd.conf.erb b/deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_agentd.conf.erb
index aa1244b..dca78bf 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_agentd.conf.erb
+++ b/deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_agentd.conf.erb
@@ -2,7 +2,7 @@
 
 # Fake server declaration to enforce running agent without
 # separate server declaration in /etc/zabbix/zabbix_agent.d/server.conf
-Server=<%= scope.lookupvar('plugin_zabbix::params::server_ip') %>,<%= scope.lookupvar('plugin_zabbix::monitoring::server_ips').join(',') %>
+Server=<%= scope.lookupvar('plugin_zabbix::params::server_ip') %>,<%= scope.lookupvar('plugin_zabbix::monitoring::server_ips').join(',') %>,<%= scope.lookupvar('plugin_zabbix::params::mgmt_vip') %>
 ServerActive=<%= scope.lookupvar('plugin_zabbix::params::server_ip') %>
 
 Hostname=<%= @fqdn %>