diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 1f13627cb3..6a5c979c7d 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -359,6 +359,7 @@ sub pandora_server_tasks ($) {
 			# Pandora self monitoring
 			if (defined($pa_config->{"self_monitoring"}) 
 				&& $pa_config->{"self_monitoring"} == 1
+				&& !is_metaconsole($pa_config)
 				&& $counter % $pa_config->{'self_monitoring_interval'} == 0) {
 				pandora_self_monitoring ($pa_config, $dbh);
 			}
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7e30bfd3ff..3bf38a8a98 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -171,6 +171,8 @@ sub pandora_get_sharedconfig ($$) {
 	# NOTE: This must be read when checking license limits!
 	#$pa_config->{"node_metaconsole"} = pandora_get_tconfig_token ($dbh, 'node_metaconsole', 0);
 
+	$pa_config->{"provisioning_mode"} = pandora_get_tconfig_token ($dbh, 'provisioning_mode', '');
+
 
 	if ($pa_config->{'include_agents'} eq '') {
 		$pa_config->{'include_agents'} = 0;
@@ -473,6 +475,10 @@ sub pandora_load_config {
 
 	$pa_config->{"unknown_updates"} = 0; # 7.0.718
 
+	$pa_config->{"provisioningserver"} = 1; # 7.0 720
+	$pa_config->{"provisioningserver_threads"} = 1; # 7.0 720
+	$pa_config->{"provisioning_cache_interval"} = 300; # 7.0 720
+
 	# Check for UID0
 	if ($pa_config->{"quiet"} != 0){
 		if ($> == 0){
@@ -1090,6 +1096,15 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^unknown_updates\s+([0-1])/i) {
 			$pa_config->{'unknown_updates'} = clean_blank($1);
 		}
+		elsif ($parametro =~ m/^provisioningserver\s+([0-1])/i){
+			$pa_config->{'provisioningserver'}= clean_blank($1);
+		}
+		elsif ($parametro =~ m/^provisioningserver_threads\s+([0-9]*)/i){
+			$pa_config->{'provisioningserver_threads'}= clean_blank($1);
+		}
+		elsif ($parametro =~ m/^provisioning_cache_interval\s+([0-9]*)/i){
+			$pa_config->{'provisioning_cache_interval'}= clean_blank($1);
+		}
 	} # end of loop for parameter #
 
 	# Set to RDBMS' standard port
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index fe528042b8..9dbef42f80 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -64,6 +64,7 @@ our @EXPORT = qw(
 	SYSLOGSERVER
 	METACONSOLE_LICENSE
 	WUXSERVER
+	PROVISIONINGSERVER
 	$DEVNULL
 	$OS
 	$OS_VERSION
@@ -133,6 +134,7 @@ use constant MFSERVER => 15;
 use constant SYNCSERVER => 16;
 use constant WUXSERVER => 17;
 use constant SYSLOGSERVER => 18;
+use constant PROVISIONINGSERVER => 19;
 
 # Module status
 use constant MODULE_NORMAL => 0;