diff --git a/Apps_for_DS/02-M-TIC_sh_cluster_base/default/server.conf b/Apps_for_DS/02-M-TIC_sh_cluster_base/default/server.conf
index d4384b2..c458e92 100644
--- a/Apps_for_DS/02-M-TIC_sh_cluster_base/default/server.conf
+++ b/Apps_for_DS/02-M-TIC_sh_cluster_base/default/server.conf
@@ -8,7 +8,7 @@ pass4SymmKey = $7$iQ3wl+w1tMlCZXopQ/BDXHv8e+xGXGR10mvQYOiCdPxZuIkKX87oMm85MSkitk
 multisite = false
 
 [shclustering]
-shcluster_label = cluster_sh
+shcluster_label = M-TIC_shcluster
 conf_deploy_fetch_url = https://SVLCTPLOGSUP01.mom.fr:8089
 pass4SymmKey = $7$iQ3wl+w1tMlCZXopQ/BDXHv8e+xGXGR10mvQYOiCdPxZuIkKX87oMm85MSkitkPk3PYW2Qhjc/kSMq2B5M0=
 
diff --git a/Apps_for_Splunk/01-Conf_ServerClass/local/serverclass.conf b/Apps_for_Splunk/01-Conf_ServerClass/local/serverclass.conf
index 2615d37..ac5ebec 100644
--- a/Apps_for_Splunk/01-Conf_ServerClass/local/serverclass.conf
+++ b/Apps_for_Splunk/01-Conf_ServerClass/local/serverclass.conf
@@ -16,14 +16,6 @@ filterType = whitelist
 
 [serverClass:Licence_Master_TIC]
 
-[serverClass:Cluster_Master_TIC]
-
-[serverClass:Cluster_Indexer_TIC]
-
-[serverClass:Cluster_SH_TIC]
-
-[serverClass:Forwarder_Linux_TIC]
-
 [serverClass:Forwarder_Windows_TIC]
 
 [serverClass:Cluster_SH_TIC:app:01-Conf_license_slave]
@@ -73,7 +65,7 @@ stateOnClient = enabled
 
 [serverClass:Cluster_Master_TIC:app:02-M-TIC_all_forwarding_outputs]
 restartSplunkWeb = 0
-restartSplunkd = 0
+restartSplunkd = 1
 stateOnClient = enabled
 
 [serverClass:Cluster_Master_TIC:app:02-M-TIC_CM]
@@ -99,4 +91,49 @@ stateOnClient = enabled
 [serverClass:Cluster_SH_TIC:app:02-M-TIC_sh_volume_indexes]
 restartSplunkWeb = 0
 restartSplunkd = 0
-stateOnClient = enabled
\ No newline at end of file
+stateOnClient = enabled
+
+[serverClass:Cluster_Indexer_TIC]
+whitelist.0 = SVLCTPLOGIDX01.mom.fr
+whitelist.1 = SVLCTPLOGIDX02.mom.fr
+
+[serverClass:Cluster_Master_TIC]
+whitelist.0 = SVLCTPLOGCLM01.mom.fr
+
+[serverClass:Cluster_SH_TIC]
+whitelist.0 = SVLCTPLOGPUB01.mom.fr
+whitelist.1 = SVLCTPLOGPUB02.mom.fr
+
+[serverClass:Forwarder_Linux_TIC:app:02-M-TIC_all_forwarding_outputs]
+restartSplunkWeb = 0
+restartSplunkd = 1
+stateOnClient = enabled
+
+[serverClass:Forwarder_Linux_TIC:app:02-M-TIC_esxi_forwarders_inputs]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Forwarder_Linux_TIC:app:02-M-TIC_linux_forwarders_inputs]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Forwarder_Linux_TIC:app:02-M-TIC_fortigate_forwarders_inputs]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Forwarder_Linux_TIC:app:02-M-TIC_catchall_forwarders_inputs]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Forwarder_Linux_TIC:app:02-M-TIC_cisco_forwarders_inputs]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Forwarder_Linux_TIC]
+whitelist.0 = SVLCTPSUPPFI01.mom.fr
+whitelist.1 = SVLCTPSUPPFI02.mom.fr
\ No newline at end of file
diff --git a/Old_Playbooks/serverclass.conf b/Old_Playbooks/serverclass.conf
new file mode 100644
index 0000000..2615d37
--- /dev/null
+++ b/Old_Playbooks/serverclass.conf
@@ -0,0 +1,102 @@
+[global]
+crossServerChecksum = false
+repositoryLocation = $SPLUNK_HOME/etc/deployment-apps
+targetRepositoryLocation = $SPLUNK_HOME/etc/apps
+tmpFolder = $SPLUNK_HOME/var/run/tmp
+
+stateOnClient = enabled
+
+restartSplunkWeb = False
+restartSplunkd = False
+issueReload = false
+continueMatching = true
+endpoint = $deploymentServerUri$/services/streams/deployment?name=$tenantName$:$serverClassName$:$appName$
+
+filterType = whitelist
+
+[serverClass:Licence_Master_TIC]
+
+[serverClass:Cluster_Master_TIC]
+
+[serverClass:Cluster_Indexer_TIC]
+
+[serverClass:Cluster_SH_TIC]
+
+[serverClass:Forwarder_Linux_TIC]
+
+[serverClass:Forwarder_Windows_TIC]
+
+[serverClass:Cluster_SH_TIC:app:01-Conf_license_slave]
+restartSplunkWeb = 0
+restartSplunkd = 1
+stateOnClient = enabled
+
+[serverClass:Cluster_Master_TIC:app:01-Conf_license_slave]
+restartSplunkWeb = 0
+restartSplunkd = 1
+stateOnClient = enabled
+
+[serverClass:Cluster_Indexer_TIC:app:01-Conf_license_slave]
+restartSplunkWeb = 0
+restartSplunkd = 1
+stateOnClient = enabled
+
+[serverClass:Cluster_Indexer_TIC:app:01-idx_kvstore_base]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Indexer_TIC:app:01-idx_receiver_port]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Indexer_TIC:app:01-idx_web_base]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Indexer_TIC:app:01-idx_volume_indexes]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Indexer_TIC:app:02-M-TIC_idx_indexes_base]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Indexer_TIC:app:02-M-TIC_idx_cluster_base]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Master_TIC:app:02-M-TIC_all_forwarding_outputs]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Master_TIC:app:02-M-TIC_CM]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Master_TIC:app:02-M-TIC_deployer_base]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_Master_TIC:app:02-M-TIC_cluster_master_base]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_SH_TIC:app:02-M-TIC_sh_cluster_base]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
+
+[serverClass:Cluster_SH_TIC:app:02-M-TIC_sh_volume_indexes]
+restartSplunkWeb = 0
+restartSplunkd = 0
+stateOnClient = enabled
\ No newline at end of file