diff --git a/code/ryzom/server/patchman_cfg/admin_install/bin/admin b/code/ryzom/server/patchman_cfg/admin_install/bin/admin
index f48de0d15..f09fc93db 100644
--- a/code/ryzom/server/patchman_cfg/admin_install/bin/admin
+++ b/code/ryzom/server/patchman_cfg/admin_install/bin/admin
@@ -80,13 +80,13 @@ then
 	cd /srv/core/patchman/
 	if [ $(grep $(hostname) auto_start_domain_list |wc -l) -gt 0 ]
 		then
-		DOMAIN_LIST=$(grep $(hostname) auto_start_domain_list | cut -d\  -f2-)
+		DOMAIN_LIST=$(grep $(hostname) auto_start_domain_list | cut -d\\  -f2-)
 	elif [ $(grep $(hostname -s) auto_start_domain_list |wc -l) -gt 0 ]
 		then
-		DOMAIN_LIST=$(grep $(hostname -s) auto_start_domain_list | cut -d\  -f2-)
+		DOMAIN_LIST=$(grep $(hostname -s) auto_start_domain_list | cut -d\\  -f2-)
 	elif [ $(grep $(hostname -d) auto_start_domain_list |wc -l) -gt 0 ]
 		then
-		DOMAIN_LIST=$(grep $(hostname -d) auto_start_domain_list | cut -d\  -f2-)
+		DOMAIN_LIST=$(grep $(hostname -d) auto_start_domain_list | cut -d\\  -f2-)
 	else
 		echo "There are no domains to be autostarted here"
 		DOMAIN_LIST=none
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.khanat.cfg
old mode 100644
new mode 100755
similarity index 95%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg
rename to code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.khanat.cfg
index 7a4176b93..dd1ceee22
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.std01.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.khanat.cfg
@@ -10,7 +10,7 @@ AESAliasName= "aes";
 DontUseStdIn = 0;
 
 // Adress ofthe admin service (default port is 49996)
-ASHost = "ep1.std01.ryzomcore.local";
+ASHost = "localhost";
 
 // Config for AES
 AESPort = "46702";
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg
deleted file mode 100644
index 0e8af6ed9..000000000
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/admin_executor_service_default.mini01.cfg
+++ /dev/null
@@ -1,99 +0,0 @@
-// I'm the AES, I'll not connect to myself!
-DontUseAES = 1;
-// I don't need a connection to a naming service
-DontUseNS = 1;
-DontLog = 1;
-
-AESAliasName= "aes";
-
-//
-DontUseStdIn = 0;
-
-// Adress ofthe admin service (default port is 49996)
-ASHost = "ep1.mini01.ryzomcore.local";
-
-// Config for AES
-AESPort = "46712";
-AESHost = "localhost";
-ASPort = "46711";
-
-
-// in second, -1 for not restarting
-RestartDelay = 60;
-
-// how many second before aborting the request if not finished
-RequestTimeout = 5;
-
-// log path for advanced log report
-LogPath = "/.";
-
-// setup for deployment environment with external configuration system responsible for launching apps and
-// for configuring AES services
-DontLaunchServicesDirectly = 1;
-UseExplicitAESRegistration = 1;
-KillServicesOnDisconnect = 1;
-
-// If the update loop is too slow, a thread will produce an assertion.
-// By default, the value is set to 10 minutes.
-// Set to 0 for no assertion.
-UpdateAssertionThreadTimeout = 0;
-
-DefaultMaxExpectedBlockSize = 200000000; // 200 M !
-DefaultMaxSentBlockSize = 200000000; // 200 M !
-
-// how to sleep between to network update
-// 0 = pipe
-// 1 = usleep
-// 2 = nanosleep
-// 3 = sched_yield
-// 4 = nothing
-UseYieldMethod = 0;
-
-NegFiltersDebug    = { "REQUEST", "GRAPH", "ADMIN", "NET", "ADMIN", "MIRROR", "NC", "PATH", "BSIF" };
-NegFiltersInfo     = { "REQUEST", "GRAPH", "ADMIN", "NET", "ADMIN", "MIRROR", "NC", "CF", " ping", " pong" };
-NegFiltersWarning  = { "CT_LRC" };
-
-#include "./aes_alias_name.cfg"
-
-StartCommands=
-{
-	// Create a gateway module
-	"moduleManager.createModule StandardGateway gw",
-	// add a layer 5 transport
-	"gw.transportAdd L5Transport l5",
-	// open the transport
-	"gw.transportCmd l5(open)",
-		
-	/// Create default connection with admin executor service
-	// Create a gateway module
-	"moduleManager.createModule StandardGateway gw_aes",
-	// create the admin executor service module 
-	"moduleManager.createModule AdminExecutorServiceClient aes_client",
-	"aes_client.plug gw_aes",
-
-	// create a layer 3 client to connect to aes gateway
-	"gw_aes.transportAdd L3Client aes_l3c",
-	"gw_aes.transportCmd aes_l3c(connect addr="+AESHost+":"+AESPort+")",
-		
-
-	// create the admin executor service module 
-	"moduleManager.createModule AdminExecutorService aes",
-
-	// create a gateway to connect to as
-	"moduleManager.createModule StandardGateway asc_gw",
-	// create a layer 3 client
-	"asc_gw.transportAdd L3Client l3c",
-	"asc_gw.transportCmd l3c(connect addr="+ASHost+":"+ASPort+")",
-
-	// create a gateway for services to connect
-	"moduleManager.createModule StandardGateway aes_gw",
-	// create a layer 3 server
-	"aes_gw.transportAdd L3Server l3s",
-	"aes_gw.transportOptions l3s(PeerInvisible)",
-	"aes_gw.transportCmd l3s(open port="+AESPort+")",
-
-	// plug the as
-	"aes.plug asc_gw",
-	"aes.plug aes_gw",
-
-};
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/auto_start_domain_list b/code/ryzom/server/patchman_cfg/admin_install/patchman/auto_start_domain_list
new file mode 100644
index 000000000..0458a848f
--- /dev/null
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/auto_start_domain_list
@@ -0,0 +1 @@
+khanat \ khanat \ khanat
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
old mode 100644
new mode 100755
index 9a9341e9a..390cc8063
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_list
@@ -1,5 +1,6 @@
 // default values for different sites
 
+khanat localhost
 mini01 ep1.mini01.ryzomcore.local
 std01 ep1.std01.ryzomcore.local
 std01 su1.std01.ryzomcore.local
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat.cfg
old mode 100644
new mode 100755
similarity index 85%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg
rename to code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat.cfg
index 23175c08b..52a033f12
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat.cfg
@@ -10,7 +10,7 @@ StartCommands =
 	// Create a gateway module on layer 3 transport and open it
 	"moduleManager.createModule StandardGateway bridge_gw",
 	"bridge_gw.transportAdd L3Client l3client",
-	"bridge_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44749)",
+	"bridge_gw.transportCmd l3client(connect addr=localhost:44749)",
 
 
 	//------------------------------------------------------------------------------
@@ -19,7 +19,7 @@ StartCommands =
 	// Create a gateway module on layer 3 transport and open it
 	"moduleManager.createModule StandardGateway spm_gw",
 	"spm_gw.transportAdd L3Client l3client",
-	"spm_gw.transportCmd l3client(connect addr=ep1.std01.ryzomcore.local:44752)",
+	"spm_gw.transportCmd l3client(connect addr=localhost:44751)",
 
 
 	//------------------------------------------------------------------------------
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat_bridge.cfg
old mode 100644
new mode 100755
similarity index 77%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg
rename to code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat_bridge.cfg
index 737177202..ebf431132
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_bridge.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat_bridge.cfg
@@ -1,5 +1,5 @@
 // *****************************************************************************
-// *** Setup for the mini01 entry point Machine
+// *** Setup for the khanat entry point Machine
 // *****************************************************************************
 
 #include "/srv/core/patchman/patchman_service_base_linux.cfg"
@@ -20,12 +20,12 @@ DisplayedVariables +=
 StartCommands +=
 {
     //------------------------------------------------------------------------------
-	// Setup the mini01 hub
+	// Setup the khanat hub
 
 	// Create a gateway modul on layer 3 transport and open it
-	"moduleManager.createModule StandardGateway hub_mini01",
-	"hub_mini01.transportAdd L3Server l3server",
-	"hub_mini01.transportCmd l3server(open port=44749)",
+	"moduleManager.createModule StandardGateway hub_khanat",
+	"hub_khanat.transportAdd L3Server l3server",
+	"hub_khanat.transportCmd l3server(open port=44749)",
 
 	
 	//------------------------------------------------------------------------------
@@ -43,15 +43,15 @@ StartCommands +=
     // Create a gateway module on layer 3 transport and open it
     "moduleManager.createModule StandardGateway spm_gw",
     "spm_gw.transportAdd L3Client l3client",
-    "spm_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44751)",
+    "spm_gw.transportCmd l3client(connect addr=localhost:44751)",
 
 
 	//------------------------------------------------------------------------------
-	// Setup mini01 Bridge module
+	// Setup khanat Bridge module
 
-	// setup a bridge module to relay files from internal to mini01 networks andd plug it in
+	// setup a bridge module to relay files from internal to khanat networks andd plug it in
 	"moduleManager.createModule ServerPatchBridge bridge path=/srv/core/bridge_server/",
-	"bridge.plug hub_mini01",
+	"bridge.plug hub_khanat",
 	"bridge.plug hub_bridge",
 	"bridge.plug spm_gw",
 
@@ -59,7 +59,7 @@ StartCommands +=
 	//------------------------------------------------------------------------------
 	// Setup the PAM module
 	"moduleManager.createModule PatchmanAdminModule pam",
-	"pam.plug hub_mini01",
+	"pam.plug hub_khanat",
 	"pam.plug spm_gw",
 };
 
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01_spm.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat_spm.cfg
old mode 100644
new mode 100755
similarity index 78%
rename from code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01_spm.cfg
rename to code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat_spm.cfg
index 79d259e4e..f72d8e003
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.std01_spm.cfg
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.khanat_spm.cfg
@@ -1,5 +1,5 @@
 // *****************************************************************************
-// *** Setup for the std01 entry point Machine
+// *** Setup for the khanat entry point Machine
 // *****************************************************************************
 
 #include "/srv/core/patchman/patchman_service_base_linux.cfg"
@@ -20,7 +20,7 @@ DisplayedVariables +=
 StartCommands +=
 {
     //------------------------------------------------------------------------------
-    // Setup the std01 spm hub
+    // Setup the khanat spm hub
 
     "moduleManager.createModule StandardGateway hub",
     "hub.transportAdd L3Server l3server",
@@ -28,10 +28,10 @@ StartCommands +=
 
 
 	//------------------------------------------------------------------------------
-	// Setup manager module for std01 version numbers etc and plug it in
+	// Setup manager module for khanat version numbers etc and plug it in
 
-	"moduleManager.createModule ServerPatchManager spm_std01 name=spm_std01",
-	"spm_std01.plug hub",
+	"moduleManager.createModule ServerPatchManager spm_khanat name=spm_khanat",
+	"spm_khanat.plug hub",
 
 	//------------------------------------------------------------------------------
 	// Setup the PAM module
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg
deleted file mode 100644
index f046815ce..000000000
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#include "/srv/core/patchman/patchman_service_base_linux.cfg"
-#include "/srv/core/patchman_service_local.cfg"
-
-StartCommands = 
-{
-	//------------------------------------------------------------------------------
-	// Setup Bridge Gateway (for retrieving files)
-
-	// Create a gateway module on layer 3 transport and open it
-	"moduleManager.createModule StandardGateway bridge_gw",
-	"bridge_gw.transportAdd L3Client l3client",
-	"bridge_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44749)",
-
-
-	//------------------------------------------------------------------------------
-	// Setup Manager Gateway (for deployment commands)
-
-	// Create a gateway module on layer 3 transport and open it
-	"moduleManager.createModule StandardGateway spm_gw",
-	"spm_gw.transportAdd L3Client l3client",
-	"spm_gw.transportCmd l3client(connect addr=ep1.mini01.ryzomcore.local:44751)",
-
-
-	//------------------------------------------------------------------------------
-	// Setup patch applier
-
-	// setup an 'spa' module for applying patches as required
-	"moduleManager.createModule ServerPatchApplier spa path=/srv/core host=" + SPAHost,
-	"spa.plug bridge_gw",
-	"spa.plug spm_gw",
-
-	//------------------------------------------------------------------------------
-	// Setup the PAM module
-	"moduleManager.createModule PatchmanAdminModule pam",
-	"pam.plug spm_gw",
-	"pam.plug bridge_gw",
-};
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_spm.cfg b/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_spm.cfg
deleted file mode 100644
index 8e6923a2b..000000000
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/patchman_service.mini01_spm.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-// *****************************************************************************
-// *** Setup for the mini01 entry point Machine
-// *****************************************************************************
-
-#include "/srv/core/patchman/patchman_service_base_linux.cfg"
-#include "/srv/core/patchman_service_local.cfg"
-
-
-//--------------------------------------------------------------------------------
-// Displayed Variables...
-
-DisplayedVariables +=
-{
-};
-
-
-//--------------------------------------------------------------------------------
-// Start Commands for configuring modules
-
-StartCommands +=
-{
-    //------------------------------------------------------------------------------
-    // Setup the mini01 spm hub
-
-    "moduleManager.createModule StandardGateway hub",
-    "hub.transportAdd L3Server l3server",
-    "hub.transportCmd l3server(open port=44751)",
-
-
-	//------------------------------------------------------------------------------
-	// Setup manager module for mini01 version numbers etc and plug it in
-
-	"moduleManager.createModule ServerPatchManager spm_mini01 name=spm_mini01",
-	"spm_mini01.plug hub",
-
-	//------------------------------------------------------------------------------
-	// Setup the PAM module
-	"moduleManager.createModule PatchmanAdminModule pam",
-	"pam.plug hub",
-};
-
diff --git a/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list b/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
old mode 100644
new mode 100755
index bb1114027..669e9632d
--- a/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
+++ b/code/ryzom/server/patchman_cfg/admin_install/patchman/special_patchman_list
@@ -1,10 +1,11 @@
 
-// mini01 - mini manager
+// khanat - khanat manager
 
-mini01_spm ep1.mini01.ryzomcore.local
-mini01_bridge ep1.mini01.ryzomcore.local
+khanat localhost
+khanat_spm localhost
+khanat_bridge localhost
 
 
 // std01 - std manager
 
-std01_spm ep1.std01.ryzomcore.local
+// std01_spm ep1.std01.ryzomcore.local
diff --git a/code/ryzom/server/patchman_cfg/cfg/01_domain_std01.cfg b/code/ryzom/server/patchman_cfg/cfg/01_domain_std01.cfg
deleted file mode 100644
index f40ffdd97..000000000
--- a/code/ryzom/server/patchman_cfg/cfg/01_domain_std01.cfg
+++ /dev/null
@@ -1,80 +0,0 @@
-// What to do with characters coming from another mainland shard?
-// 0: teleport to the stored session id
-// 1: let the character play anyway, but leave the stored session id unchanged
-// 2: assign the stored session id with FixedSessionId and let play
-AllowCharsFromAllSessions = 0;
-
-// Use Shard Unifier or not
-DontUseSU = 0;
-
-// the domain's set of useful addresses
-LSHost = SUHost;
-RSMHost = SUHost;
-
-// MFS config
-WebSrvUsersDirectory = "";
-HoFHDTDirectory = "/srv/core/www/hof/hdt";
-
-// BS Specifics --------------------------------------------------------------------------
-// BS - set to 1 if a BS is not part of a naming service group (then BS not disclosed
-// to other services by the Layer 5, i.e. the services sending requests to BS have
-// to know its/their address(es) by another mean)
-BSDontUseNS = 1;
-// BS - set the host of the naming service where the BS register
-BSNSHost = "localhost";
-UseBS = 1;
-XMLSave = 0;
-
-// Where to save specific shard data (ie: player backup), relatively to SaveShardRoot
-SaveFilesDirectory	= "";
-
-// where to save generic shard data (ie: packed_sheet)
-WriteFilesDirectory	= "r2_shard/data_shard";
-
-// Will SaveFilesDirectory will be converted to a full path?
-ConvertSaveFilesDirectoryToFullPath = 0;
-
-// BS - Root directory where data are backuped to
-IncrementalBackupDirectory = "../incremental_backup";
-
-// IOS - Directory to store ios.string_cache file
-StringManagerCacheDirectory = "../data_shard_local";
-
-// IOS - Directory to log chat into
-LogChatDirectory = "../data_shard_local";
-
-// MFS - Directories
-WebRootDirectory = "../www";
-
-// Root directory where data from shards are stored into
-SaveShardRoot = "../save_shard/";
-
-// SU Specifics --------------------------------------------------------------------------
-// SU - set to 1 if SU didn't use a naming service
-SUDontUseNS = 1;
-// SU - host for the NS used by SU
-SUNSHost = "localhost";
-// SU - listen address of the SU service (for L5 connections)
-SUAddress = SUHost+":"+SUPort;
-// SU - nel and ring database names
-DBNelName = "nel";
-DBRingName = "ring_std01";
-// Nel DB user
-DBNelUser = "su_agent";
-// Ring DB user
-DBRingUser = "su_agent";
-// SU - password to access to the nel database with DBNelUseruser (default is no password)
-DBNelPass = "p4ssw0rd";
-// SU - password to access to the ring database with DBRingUser (default is no password)
-DBRingPass = "p4ssw0rd";
-
-// WS Specifics --------------------------------------------------------------------------
-// WS - use or not the legacy WelcomeService from nel ns (only for backward compatibility during transition to ring)
-DontUseLSService = 1;
-
-// Global config --------------------------------------------------------------------------
-// set to 0 if you want to use the admin system
-DontUseAES = 1;
-
-// Dissable generation / display of nldebug messages
-DissableNLDebug = 1;
diff --git a/code/ryzom/server/patchman_cfg/shard_ctrl_khanat.txt b/code/ryzom/server/patchman_cfg/shard_ctrl_khanat.txt
index 972791f7e..35693297c 100644
--- a/code/ryzom/server/patchman_cfg/shard_ctrl_khanat.txt
+++ b/code/ryzom/server/patchman_cfg/shard_ctrl_khanat.txt
@@ -12,7 +12,7 @@
 define domain_khanat
 	domain khanat
 	use shard_khanat_unifier
-	use shard_khanat_mainland01
+	use shard_khanat_lirria
 // 	use shard_khanat_ring01
 
 	// domain ports
@@ -30,15 +30,15 @@ define domain_khanat
 
 	// domain hosts
 	cfg AESHost = "localhost";
-	cfg SUHost = "lirria.khaganat.net";
-	cfg MFSHost = "lirria.khaganat.net";
-	cfg BSHost = "lirria.khaganat.net:49990";
-	cfg SlaveBSHost= "lirria.khaganat.net:49991";
-	cfg MasterLGSHost = "lirria.khaganat.net";
-	cfg SlaveLGSHost = "lirria.khaganat.net";
-	cfg LGSBSHost = "lirria.khaganat.net";
-	cfg DBHost = "lirria.khaganat.net";
-	cfgAfter WebSrvHost = "http://lirria.khaganat.net:50000/";
+	cfg SUHost = "localhost";
+	cfg MFSHost = "localhost";
+	cfg BSHost = "localhost:49990";
+	cfg SlaveBSHost= "localhost:49991";
+	cfg MasterLGSHost = "localhost";
+	cfg SlaveLGSHost = "localhost";
+	cfg LGSBSHost = "localhost";
+	cfg DBHost = "localhost";
+	cfgAfter WebSrvHost = "localhost:50000/";
 
 	// initial config files
 	cfgFile ../cfg/00_base.cfg
@@ -84,7 +84,7 @@ define shard_khanat_unifier
 	use exe_set_std_lgs_slave
 	use backup_lgs
 	cfg DBPass = DBNelPass;
-	host lirria.khaganat.net
+	host localhost
 
 
 // shard mainland01 ----------------
@@ -95,10 +95,10 @@ define shard_khanat_lirria
 	cfg ShardId = 301;
 	cfg BasePort = 52000;
 	cfg SaveFilesDirectory="khanat_lirria/";
-	cfg NSHost = "lirria.khaganat.net";
-	cfg FSListenHost = "lirria.khaganat.net";
+	cfg NSHost = "localhost";
+	cfg FSListenHost = "localhost";
 	cfgFile ../cfg/02_shard_type_mini_mainland.cfg
-	host lirria.khaganat.net
+	host localhost
 
 
 // shard ring01 --------------------
@@ -110,7 +110,7 @@ define shard_khanat_ring01
 	cfg BasePort = 52400;
 	cfg SaveFilesDirectory="khanat_ring01/";
 	cfg NSPort = 51100;
-	cfg NSHost = "lirria.khaganat.net" + 51100;
+	cfg NSHost = "localhost" + 51100;
 	cfgFile ../cfg/02_shard_type_std_ring.cfg
-	host lirria.khaganat.net
+	host localhost
 
diff --git a/code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt b/code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt
deleted file mode 100644
index 5492d6af3..000000000
--- a/code/ryzom/server/patchman_cfg/shard_ctrl_std01.txt
+++ /dev/null
@@ -1,442 +0,0 @@
-//-----------------------------------------------------------------------------
-// The set of std01 domains
-//-----------------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------------
-// std01 Domain
-//-----------------------------------------------------------------------------
-
-// the std01 domain -----------------
-
-define domain_std01
-	domain std01
-	use shard_std01_unifier
-	use shard_std01_mainland01
-	use shard_std01_mainland02
-	use shard_std01_ring01
-	use shard_std01_ring02
-
-	// domain ports
-	cfg ASWebPort="46700";
-	cfg ASPort="46701";
-	cfg AESPort="46702";
-	cfg SUPort = 50505;
-	cfg SUGlobalPort = 50503;
-	cfg L3BSPort = "49950";
-	cfg L3SlaveBSPort = "49951";
-	cfg L3MasterLGSPort = 49992;
-	cfg L3SlaveLGSPort = 49993;
-	cfg LGSBSPort = 49994;
-	cfg L3LGSBSPort = 49995;
-
-	// domain hosts
-	cfg AESHost = "localhost";
-	cfg SUHost = "su1.std01.ryzomcore.local";
-	cfg MFSHost = "su1.std01.ryzomcore.local";
-	cfg BSHost = "pd1.std01.ryzomcore.local:49990"; // Backup service host for domain
-	cfg SlaveBSHost= "pd2.std01.ryzomcore.local:49991";
-	cfg MasterLGSHost = "pd3.std01.ryzomcore.local";
-	cfg SlaveLGSHost = "pd4.std01.ryzomcore.local";
-	cfg LGSBSHost = "csr.core.ryzomcore.local"; // Backup service host for log service
-	cfg DBHost = "sql.core.ryzomcore.local";
-	cfgAfter WebSrvHost = "http://su1.std01.ryzomcore.local:50000/";
-
-	// initial config files
-	cfgFile ../cfg/00_base.cfg
-	cfgFile ../cfg/01_domain_std01.cfg
-
-	// shard names and ids
-	cfgAfter Mainlands = {
-	cfgAfter 	"101", "Mainland 01", "(Mainland 01)", "en",
-	cfgAfter 	"102", "Mainland 02", "(Mainland 02)", "en",
-	cfgAfter };
-	cfgAfter HomeMainlandNames =
-	cfgAfter {
-	cfgAfter 	"101", "Mainland 01", "mla",
-	cfgAfter 	"102", "Mainland 02", "mlb",
-	cfgAfter };
-	cfgAfter RRDVarPath = "../rrd_graphs";
-
-	// addition of extra filters for this domain
-//	cfgAfter NegFiltersDebug+= {"DEFAULT_CB", "NET","ADMIN","MIRROR","CDB_MULTI_IMPULSION"};
-	cfgAfter NegFiltersInfo+= {"FESTATS", "FETIME", "FERECV", "FESEND: sent SYNC message to client 1", "EIT: Register EId"};
-	cfgAfter NegFiltersWarning+= {"PIPO_SESSION1", "casino_session_matis01", "invalid damage type 10", "_log_Item_Delete", 
-	cfgAfter "_log_Item_Money", "_log_Item_Create", "_log_Item_Move", "botChatMissionAdvance> invalid index 0", 
-	cfgAfter "_MaxRange(0) < _MinRange(1)", "Can't find craft plan sheet 'unknown.unknown'"};
-	cfgAfter DontUseAES=1;
-//	cfgAfter RingAccessLimits="d3:j2:f2:l2:p2";
-	cfgAfter RingRPEnabled=0;
-	cfgAfter DomainName = "std01";
-	cfgAfter EnableStlAllocatorChecker = 0;
-
-	cfgAfter // start commands for setting up the exchange level caps of different std01 shards
-	cfgAfter StartCommands += { "setShardExchangeLimit 101 250" };
-	cfgAfter StartCommands += { "setShardExchangeLimit 102 250" };
-	cfgAfter StartCommands += { "displayShardExchangeLimits" };
-
-
-// shard unifier -------------------
-
-define shard_std01_unifier
-	shard unifier
-	cfg ShardId = 100;
-	use shard_exe_set_std01_ras
-	use shard_exe_set_std01_unifier
-
-define shard_exe_set_std01_ras
-	use ras
-	host ep1.std01.ryzomcore.local
-	
-define shard_exe_set_std01_unifier
-	use exe_set_std_unifier
-	host su1.std01.ryzomcore.local
-	cfg DBPass = DBNelPass;
-
-
-// shard mainland01 ----------------
-
-define shard_std01_mainland01
-	shard mainland01
-	use shard_exe_set_std01_mainland01_be01
-	use shard_exe_set_std01_mainland01_be02
-	use shard_exe_set_std01_mainland01_be03
-	use shard_exe_set_std01_mainland01_fe01
-	use shard_exe_set_std01_mainland01_fe02
-	cfg ShardId = 101;
-	cfg BasePort = 51000;
-	cfg SaveFilesDirectory="std01_mainland01/";
-	cfg NSHost = "mla1.std01.ryzomcore.local";
-	cfgFile ../cfg/02_shard_type_std_mainland.cfg
-
-define shard_exe_set_std01_mainland01_be01
-	use exe_set_std_mainland_be01
-	host mla1.std01.ryzomcore.local
-
-define shard_exe_set_std01_mainland01_be02
-	use exe_set_std_mainland_be02
-	host mla2.std01.ryzomcore.local
-
-define shard_exe_set_std01_mainland01_be03
-	use exe_set_std_mainland_be03
-	host mla3.std01.ryzomcore.local
-
-define shard_exe_set_std01_mainland01_fe01
-	use exe_set_std_mainland_fe
-	host mla4.std01.ryzomcore.local
-	cfg FSListenHost = "mla4.std01.ryzomcore.local";
-
-define shard_exe_set_std01_mainland01_fe02
-	use exe_set_std_mainland_fe
-	host mla5.std01.ryzomcore.local
-	cfg FSListenHost = "mla5.std01.ryzomcore.local";
-
-
-// shard mainland02 ----------------
-
-define shard_std01_mainland02
-	shard mainland02
-	use shard_exe_set_std01_mainland02_be01
-	use shard_exe_set_std01_mainland02_be02
-	use shard_exe_set_std01_mainland02_be03
-	use shard_exe_set_std01_mainland02_fe01
-	use shard_exe_set_std01_mainland02_fe02
-	cfg ShardId = 102;
-	cfg BasePort = 51100;
-	cfg SaveFilesDirectory="std01_mainland02/";
-	cfg NSHost = "mlb1.std01.ryzomcore.local";
-	cfgFile ../cfg/02_shard_type_std_mainland.cfg
-
-define shard_exe_set_std01_mainland02_be01
-	use exe_set_std_mainland_be01
-	host mlb1.std01.ryzomcore.local
-
-define shard_exe_set_std01_mainland02_be02
-	use exe_set_std_mainland_be02
-	host mlb2.std01.ryzomcore.local
-
-define shard_exe_set_std01_mainland02_be03
-	use exe_set_std_mainland_be03
-	host mlb3.std01.ryzomcore.local
-
-define shard_exe_set_std01_mainland02_fe01
-	use exe_set_std_mainland_fe
-	host mlb4.std01.ryzomcore.local
-	cfg FSListenHost = "mlb4.std01.ryzomcore.local";
-
-define shard_exe_set_std01_mainland02_fe02
-	use exe_set_std_mainland_fe
-	host mlb5.std01.ryzomcore.local
-	cfg FSListenHost = "mlb5.std01.ryzomcore.local";
-
-
-// shard ring01 --------------------
-
-define shard_std01_ring01
-	shard ring01
-	use shard_exe_set_std01_ring01_be
-	use shard_exe_set_std01_ring01_fe
-	cfg ShardId = 201;
-	cfg BasePort = 51400;
-	cfg SaveFilesDirectory="std01_ring01/";
-	cfg NSHost = "rra1.std01.ryzomcore.local";
-	cfgFile ../cfg/02_shard_type_std_ring.cfg
-
-define shard_exe_set_std01_ring01_be
-	use exe_set_std_ring_be
-	host rra1.std01.ryzomcore.local
-
-define shard_exe_set_std01_ring01_fe
-	use exe_set_std_ring_fe
-	host rra2.std01.ryzomcore.local
-	cfg FSListenHost = "rra2.std01.ryzomcore.local";
-
-
-// shard ring02 --------------------
-
-define shard_std01_ring02
-	shard ring02
-	use shard_exe_set_std01_ring02_be
-	use shard_exe_set_std01_ring02_fe
-	cfg ShardId = 202;
-	cfg BasePort = 51500;
-	cfg SaveFilesDirectory="std01_ring02/";
-	cfg NSHost = "rrb1.std01.ryzomcore.local";
-	cfgFile ../cfg/02_shard_type_std_ring.cfg
-
-define shard_exe_set_std01_ring02_be
-	use exe_set_std_ring_be
-	host rrb1.std01.ryzomcore.local
-
-define shard_exe_set_std01_ring02_fe
-	use exe_set_std_ring_fe
-	host rrb2.std01.ryzomcore.local
-	cfg FSListenHost = "rrb2.std01.ryzomcore.local";
-
-
-// the std01 backup domain ----------
-
-define domain_std01_backup
-	domain backup01
-	use shard_std01_backup_ras
-	use shard_std01_backup
-	use shard_std01_lgs
-
-	// domain ports
-	cfg ASWebPort="46710";
-	cfg ASPort="46711";
-	cfg AESPort="46712";
-
-	// initial config files
-	cfgFile ../cfg/00_base.cfg
-	cfgFile ../cfg/01_domain_std01.cfg
-
-	// addition of extra filters for this domain
-	cfgAfter NegFiltersDebug+= {"DEFAULT_CB", "NET","ADMIN","MIRROR","CDB_MULTI_IMPULSION"};
-	cfgAfter NegFiltersInfo+= {"NET", "FETIME","TimerManagerUpdate"};
-	cfgAfter NegFiltersWarning+= {"AES"};
-
-	// Force all backup services to launch in write only mode
-	cfgAfter BSReadState = 0;
-	cfgAfter RRDVarPath = "../rrd_graphs";
-	cfgAfter DontUseAES=1;
-	cfgAfter DontUseNS=1;
-	
-	// shard names and ids
-	cfgAfter Mainlands = {
-	cfgAfter 	"101", "Mainland 01", "(Mainland 01)", "en",
-	cfgAfter 	"102", "Mainland 02", "(Mainland 02)", "en",
-	cfgAfter };
-	cfgAfter HomeMainlandNames =
-	cfgAfter {
-	cfgAfter 	"101", "Mainland 01", "mla",
-	cfgAfter 	"102", "Mainland 02", "mlb",
-	cfgAfter };
-
-
-// backup domain ras ---------------
-
-define shard_std01_backup_ras
-	shard std01_backup_ras
-	cfg ShardId = 100;
-	use ras
-	host ep1.std01.ryzomcore.local
-
-
-// the main backup pair ------------
-
-define shard_std01_backup
-	shard backup
-	use shard_exe_set_std01_backup_master
-	use shard_exe_set_std01_backup_slave
-
-define shard_exe_set_std01_backup_master
-	name bs_master
-	use exe_set_std_backup_master
-	host pd1.std01.ryzomcore.local
-
-define shard_exe_set_std01_backup_slave
-	name bs_slave
-	// hack to workaround bug in backup service
-//	use exe_set_std_backup_slave
-	use exe_set_std01_backup_slave
-	host pd2.std01.ryzomcore.local
-	cfgAfter MasterBSHost = "pd1.std01.ryzomcore.local:49990";
-
-// hack to workaround bug in backup service
-define exe_set_std01_backup_slave
-	use raes
-	use std01_backup_slave
-	use pdss
-
-// hack to workaround bug in backup service
-define std01_backup_slave
-	use bms
-	cmdLine backup_service -C. -L. --nobreak --writepid -P49991
-	cfg #include "../std01/cfg/backup_module_service_slave.cfg"
-	cfgAfter ListeningPort = 49991;
-	cfgAfter L3ListeningPort = 49951;
-	cfgAfter WebPort = 49971;
-	cfgAfter BSReadState = 0;
-	cfgAfter SaveShardRoot = "../save_shard/";
-
-
-// lgs pair & relates bs ------------
-
-define shard_std01_lgs
-	shard lgs
-	use shard_exe_set_std01_lgs_primary
-	use shard_exe_set_std01_lgs_secondary
-	use shard_exe_set_std01_lgs_bs
-	cfg L3MasterLGSPort = 49992;
-	cfg L3SlaveLGSPort = 49993;
-	cfg LGSBSPort = 49994;
-	cfg L3LGSBSPort = 49995;
-	cfg MasterLGSHost = "pd3.std01.ryzomcore.local";
-	cfg SlaveLGSHost = "pd4.std01.ryzomcore.local";
-	cfg LGSBSHost = "csr.core.ryzomcore.local";
-
-define shard_exe_set_std01_lgs_primary
-	name lgs_primary
-	use raes
-	use exe_set_std_lgs_master
-	host pd3.std01.ryzomcore.local
-	
-define shard_exe_set_std01_lgs_secondary
-	name lgs_secondary
-	use raes
-	use exe_set_std_lgs_slave
-	host pd4.std01.ryzomcore.local
-
-define shard_exe_set_std01_lgs_bs
-	name lgs_bs
-	use raes
-	use backup_lgs
-	host csr.core.ryzomcore.local
-
-
-// the std01 las domain -------------
-
-define domain_std01_las
-	domain las01
-	use shard_std01_las_ras
-	use shard_std01_las_master
-	use shard_std01_las_slave
-
-	// domain ports
-	cfg ASWebPort="46720";
-	cfg ASPort="46721";
-	cfg AESPort="46722";
-
-	// initial config files
-	cfgFile ../cfg/00_base.cfg
-//	cfgFile ../cfg/01_domain_std01.cfg
-
-	// addition of extra filters for this domain
-	cfgAfter NegFiltersDebug+= {"DEFAULT_CB", "NET","ADMIN","MIRROR","CDB_MULTI_IMPULSION"};
-	cfgAfter NegFiltersInfo+= {"NET", "FETIME","TimerManagerUpdate"};
-	cfgAfter NegFiltersWarning+= {"AES"};
-	cfgAfter DontUseAES=1;
-	
-
-// las domain ras ------------------
-
-define shard_std01_las_ras
-	shard std01_las_ras
-	cfg ShardId = 100;
-	use ras
-	host ep1.std01.ryzomcore.local
-
-
-// master las ----------------------
-
-define shard_std01_las_master
-	shard std01_las_master
-	cfg ShardId = 99;
-	use raes
-	use las_mainland01
-	use las_mainland02
-	use las_ring01
-	use las_ring02
-	host pd3.std01.ryzomcore.local
-
-define las_mainland01
-	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_mainland01/pds"};
-	cfgAfter WebPort = 49899;
-	name las_mainland01
-	use las
-
-define las_mainland02
-	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_mainland02/pds"};
-	cfgAfter WebPort = 49898;
-	name las_mainland02
-	use las
-
-define las_ring01
-	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_ring01/pds"};
-	cfgAfter WebPort = 49894;
-	name las_ring01
-	use las
-
-define las_ring02
-	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_ring02/pds"};
-	cfgAfter WebPort = 49893;
-	name las_ring02
-	use las
-
-
-// slave las ------------------------
-
-define shard_std01_las_slave
-	shard std01_las_slave
-	cfg ShardId = 98;
-	use raes
-	use las_mainland01_slave
-	use las_mainland02_slave
-	use las_ring01_slave
-	use las_ring02_slave
-	host pd4.std01.ryzomcore.local
-
-define las_mainland01_slave
-	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_mainland01/pds"};
-	cfgAfter WebPort = 49899;
-	name las2_mainland01
-	use las
-
-define las_mainland02_slave
-	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_mainland02/pds"};
-	cfgAfter WebPort = 49898;
-	name las2_mainland02
-	use las
-
-define las_ring01_slave
-	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_ring01/pds"};
-	cfgAfter WebPort = 49894;
-	name las2_ring01
-	use las
-
-define las_ring02_slave
-	cfgAfter StartCommands += {"PDRootDirectory /srv/core/backup01/save_shard_pd/std01_ring02/pds"};
-	cfgAfter WebPort = 49893;
-	name las2_ring02
-	use las
diff --git a/code/ryzom/server/patchman_cfg/terminal_khanat/patchman_service.cfg b/code/ryzom/server/patchman_cfg/terminal_khanat/patchman_service.cfg
index 3a3336339..858281cc0 100644
--- a/code/ryzom/server/patchman_cfg/terminal_khanat/patchman_service.cfg
+++ b/code/ryzom/server/patchman_cfg/terminal_khanat/patchman_service.cfg
@@ -14,7 +14,7 @@ NegFiltersInfo		= { "NET"  };
 NegFiltersWarning	= { "NETL", "CT_LRC", "VAR:" };
 
 // Setting up WIN displayer
-WindowStyle = "WIN";
+WindowStyle = "GTK";
 FontName = "Courier New";
 FontSize = 9;
 
@@ -43,10 +43,10 @@ StartCommands +=
 //	"gw1.transportAdd L3Client l3client",
 //	"gw1.transportCmd l3client(connect addr=lirria.khaganat.net:44748)",
 
-	// ats spm gateway
+	// Setup Manager gateway (on bridge)
 	"moduleManager.createModule StandardGateway gw2",
 	"gw2.transportAdd L3Client l3client",
-	"gw2.transportCmd l3client(connect addr=lirria.khaganat.net:44751)",
+	"gw2.transportCmd l3client(connect addr=localhost:44751)",
 
 
 	//------------------------------------------------------------------------------
@@ -71,12 +71,12 @@ DisplayedVariables +=
 		"@PAM States|terminal.state *pam",
 		"@Update PAMs|terminal.on *pam installUpdate",
 		"@Quit PAMs|terminal.on *pam quit",
-	"", "SPT0",
-	"", "SPT1",
-	"", "SPT2",
-	"", "SPT3",
-	"", "SPT4",
-	"", "SPT5",
+//	"", "SPT0",
+//	"", "SPT1",
+//	"", "SPT2",
+//	"", "SPT3",
+//	"", "SPT4",
+//	"", "SPT5",
 //	"", "SPT6",
 //	"", "SPT7",
 //	"", "SPT8",
diff --git a/code/ryzom/server/patchman_cfg/terminal_khanat/terminal_khanat b/code/ryzom/server/patchman_cfg/terminal_khanat/terminal_khanat
new file mode 100755
index 000000000..e1de4ebf4
--- /dev/null
+++ b/code/ryzom/server/patchman_cfg/terminal_khanat/terminal_khanat
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/Volumes/SIELA/Khaganat/khaganat/code/build_server/bin/ryzom_patchman_service --nolog -C. -L.
diff --git a/code/ryzom/server/patchman_cfg/terminal_std01/patchman_service.cfg b/code/ryzom/server/patchman_cfg/terminal_std01/patchman_service.cfg
deleted file mode 100644
index 7f36f47ee..000000000
--- a/code/ryzom/server/patchman_cfg/terminal_std01/patchman_service.cfg
+++ /dev/null
@@ -1,93 +0,0 @@
-//--------------------------------------------------------------------------------
-// Stuff for Windows (as opposed to Linux)
-
-//--------------------------------------------------------------------------------
-// Stuff common to all patchman services
-DontUseAES = 1;
-DontUseTS = 1;
-DontUseNS = 1;
-UpdateAssertionThreadTimeout = 0;
-
-// Common Filters
-NegFiltersDebug		= { "NET", "VERBOSE", "GUSREP" };
-NegFiltersInfo		= { "NET"  };
-NegFiltersWarning	= { "NETL", "CT_LRC", "VAR:" };
-
-// Setting up WIN displayer
-WindowStyle = "WIN";
-FontName = "Courier New";
-FontSize = 9;
-
-// For windows boxes we dissable out stdin thread
-DontUseStdIn = 1;
-
-// how to sleep between to network update
-// 0 = pipe
-// 1 = usleep
-// 2 = nanosleep
-// 3 = sched_yield
-// 4 = nothing
-UseYieldMethod = 0;
-
-
-//--------------------------------------------------------------------------------
-// Start Commands for configuring modules
-
-StartCommands += 
-{
-	//------------------------------------------------------------------------------
-	// Setup gateways
-
-	// bridge gateway
-//	"moduleManager.createModule StandardGateway gw1",
-//	"gw1.transportAdd L3Client l3client",
-//	"gw1.transportCmd l3client(connect addr=localhost:44748)",
-
-	// ats spm gateway
-	"moduleManager.createModule StandardGateway gw2",
-	"gw2.transportAdd L3Client l3client",
-	"gw2.transportCmd l3client(connect addr=localhost:44752)",
-
-
-	//------------------------------------------------------------------------------
-	// Setup for terminal
-
-	// setup an 'spt' module to act as a terminal for the internal spm module
-	"moduleManager.createModule ServerPatchTerminal terminal target=spm_std01",
-	"terminal.plug gw1",
-	"terminal.plug gw2",
-};
-
-
-//--------------------------------------------------------------------------------
-// Displayed Variables...
-
-DisplayedVariables += 
-{
-		"@States|terminal.state *",
-	"",	"@STD01 Domains (live,backup,las)|terminal.dump",
-	"",	"@SPA States|terminal.state *spa",
-		"@Deploy|terminal.uploadDepCfg",
-		"@PAM States|terminal.state *pam",
-		"@Update PAMs|terminal.on *pam installUpdate",
-		"@Quit PAMs|terminal.on *pam quit",
-	"", "SPT0",
-	"", "SPT1",
-	"", "SPT2",
-	"", "SPT3",
-	"", "SPT4",
-	"", "SPT5",
-//	"", "SPT6",
-//	"", "SPT7",
-//	"", "SPT8",
-//	"", "SPT9",
-//	"", "SPTA",
-//	"", "SPTB",
-//	"", "SPTC",
-//	"", "SPTD",
-//	"", "SPTE",
-//	"", "SPTF",
-//	"", "LastMsg|LastSPTMessage",
-};
-		
-NumSPTWatches=5;
diff --git a/code/ryzom/server/patchman_cfg/terminal_std01/server_park_database.txt b/code/ryzom/server/patchman_cfg/terminal_std01/server_park_database.txt
deleted file mode 100644
index da45f44f1..000000000
--- a/code/ryzom/server/patchman_cfg/terminal_std01/server_park_database.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// ---------------------------------
-// common definitions
-
-include "../shard_ctrl_definitions.txt"
-
-
-// ---------------------------------
-// live domain
-
-include "../shard_ctrl_std01.txt"
diff --git a/code/ryzom/server/patchman_cfg/terminal_std01/terminal_std01.bat b/code/ryzom/server/patchman_cfg/terminal_std01/terminal_std01.bat
deleted file mode 100644
index 7f61bfa59..000000000
--- a/code/ryzom/server/patchman_cfg/terminal_std01/terminal_std01.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-start S:\devw_x86\bin\Release\ryzom_patchman_service.exe --nolog -C. -L.
\ No newline at end of file