diff --git a/src/im_mad/remotes/vcenter.d/monitord-client.rb b/src/im_mad/remotes/vcenter.d/monitord-client.rb
index b6b1c9d730..4d808218b7 100644
--- a/src/im_mad/remotes/vcenter.d/monitord-client.rb
+++ b/src/im_mad/remotes/vcenter.d/monitord-client.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -29,9 +29,10 @@ require 'rexml/document'
 
 require_relative '../lib/probe_db'
 
+#-------------------------------------------------------------------------------
 #  This class represents a monitord client. It handles udp and tcp connections
 #  and send update messages to monitord
-#
+#-------------------------------------------------------------------------------
 class MonitorClient
 
     # Defined in src/monitor/include/MonitorDriverMessages.h
@@ -110,9 +111,10 @@ class MonitorClient
 
 end
 
+#-------------------------------------------------------------------------------
 #  This class wraps the execution of a probe directory and sends data to
 #  monitord (optionally)
-#
+#-------------------------------------------------------------------------------
 class ProbeRunner
 
     def initialize(hyperv, path, stdin)
@@ -125,6 +127,8 @@ class ProbeRunner
     #   @return[Array] rc, data. rc 0 for success and data is the output of
     #   probes. If rc is -1 it signal failure and data is the error message of
     #   the failing probe
+    #
+    # rubocop:disable Lint/SuppressedException
     def run_probes
         data = ''
         dpro = Dir.new(@path)
@@ -167,6 +171,7 @@ class ProbeRunner
 
         [0, data]
     end
+    # rubocop:enable Lint/SuppressedException
 
     # Singleton call for run_probes method
     def self.run_once(hyperv, path, stdin)
@@ -209,26 +214,32 @@ class ProbeRunner
 
 end
 
+#-------------------------------------------------------------------------------
+#  Script helper functions and gLobals
+#-------------------------------------------------------------------------------
+LOCAL_HYPERVISOR = %w[az ec2 one packet vcenter].freeze
+
+def local?(hypervisor)
+    LOCAL_HYPERVISOR.include?(hypervisor)
+end
+
 #-------------------------------------------------------------------------------
 # Configuration (from monitord)
 #-------------------------------------------------------------------------------
-xml_txt = Base64.decode64(STDIN.read)
+xml_txt = STDIN.read
 
 begin
-    config = REXML::Document.new(xml_txt).root
+    hyperv = ARGV[0].split(' ')[0]
+
+    xml_txt = Base64.decode64(xml_txt) if local? hyperv
+    config  = REXML::Document.new(xml_txt).root
 
     host   = config.elements['UDP_LISTENER/MONITOR_ADDRESS'].text.to_s
     port   = config.elements['UDP_LISTENER/PORT'].text.to_s
     pubkey = config.elements['UDP_LISTENER/PUBKEY'].text.to_s
     hostid = config.elements['HOST_ID'].text.to_s
-    hyperv = ARGV[0].split(' ')[0]
 
     probes = {
-        :beacon_host_udp => {
-            :period => config.elements['PROBES_PERIOD/BEACON_HOST'].text.to_s,
-            :path => 'host/beacon'
-        },
-
         :system_host_udp => {
             :period => config.elements['PROBES_PERIOD/SYSTEM_HOST'].text.to_s,
             :path => 'host/system'
@@ -247,6 +258,11 @@ begin
         :monitor_vm_udp => {
             :period => config.elements['PROBES_PERIOD/MONITOR_VM'].text.to_s,
             :path => 'vm/monitor'
+        },
+
+        :beacon_host_udp => {
+            :period => config.elements['PROBES_PERIOD/BEACON_HOST'].text.to_s,
+            :path => 'host/beacon'
         }
     }
 
@@ -301,11 +317,14 @@ threads = []
 
 probes.each do |msg_type, conf|
     threads << Thread.new do
-        ProbeRunner.monitor_loop(hyperv, conf[:path], conf[:period], xml_txt) do |rc, da|
+        ProbeRunner.monitor_loop(hyperv,
+                                 conf[:path],
+                                 conf[:period],
+                                 xml_txt) do |result, da|
             da.strip!
             next if da.empty?
 
-            client.send(msg_type, rc == 0, da)
+            client.send(msg_type, result == 0, da)
         end
     end
 end
diff --git a/src/im_mad/remotes/vcenter.d/monitord-client_control.sh b/src/im_mad/remotes/vcenter.d/monitord-client_control.sh
index 76652e3643..82dc302bc5 100755
--- a/src/im_mad/remotes/vcenter.d/monitord-client_control.sh
+++ b/src/im_mad/remotes/vcenter.d/monitord-client_control.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -28,6 +28,8 @@ fi
 
 ARGV=$*
 
+HID=$2
+
 STDIN=`cat -`
 
 # Directory that contains this file
@@ -40,10 +42,12 @@ BASENAME=$(basename $0 _control.sh)
 CLIENT=$DIR/${BASENAME}.rb
 
 # Collectd client PID
-CLIENT_PID_FILE=/tmp/one-monitord-client.pid
+CLIENT_PID_FILE=/tmp/one-monitord-$HID.pid
 
 # Launch the client
 function start_client() {
+    rm $CLIENT_PID_FILE >/dev/null 2>&1
+
     echo "$STDIN" | /usr/bin/env ruby $CLIENT $ARGV &
 
     echo $! > $CLIENT_PID_FILE
@@ -51,7 +55,7 @@ function start_client() {
 
 # Stop the client
 function stop_client() {
-    local pids=$(ps axuww | grep /monitord-client.rb | grep -v grep | awk '{print $2}')
+    local pids=$(ps axuww | grep "$CLIENT $ARGV" | grep -v grep | awk '{print $2}')
 
     if [ -n "$pids" ]; then
         kill -9 $pids