diff --git a/22.Initialize_configuration_file/0_setup.sh b/22.Initialize_configuration_file/0_setup.sh
index 0248980b6f018f14e39aaa3c718640541cda379a..5fa1281c1caecae40acdf99dbed2639a790407a7 100755
--- a/22.Initialize_configuration_file/0_setup.sh
+++ b/22.Initialize_configuration_file/0_setup.sh
@@ -11,7 +11,7 @@ sed -i "s@^wowza_manager_pwd = .*@wowza_manager_pwd = '${WOWZA_MANAGER_PWD}'@" /
 sed -i "s@^wowza_license = .*@wowza_license = '${WOWZA_LICENSE}'@" /root/envsetup/conf.py
 sed -i "s@^wowza_live_pwd = .*@wowza_live_pwd = '${WOWZA_LIVE_PASSWD}'@" /root/envsetup/conf.py
 # MS
-sed -i "s@^ms_server_name = .*@ms_server_name = '${HOSTNAME}'@" /root/envsetup/conf.py
+sed -i "s@^ms_server_name = .*@ms_server_name = '${MS}'@" /root/envsetup/conf.py
 sed -i "s@^ms_superuser_pwd = .*@ms_superuser_pwd = '${SUPERUSER_PWD}'@" /root/envsetup/conf.py
 sed -i "s@^ms_admin_pwd = .*@ms_admin_pwd = '${ADMIN_PWD}'@" /root/envsetup/conf.py
 MS_ID=$(echo "$(hostname)_msuser")
diff --git a/envsetup-launcher.sh b/envsetup-launcher.sh
index 03092168e448b8fdfc45f2ce995c64f506fe967d..f332734d4d30f7075e3a2a0a57eade861668a681 100755
--- a/envsetup-launcher.sh
+++ b/envsetup-launcher.sh
@@ -22,9 +22,9 @@ exec > >(tee -i ${LOGFILE})
 init() {
     python3 /root/envsetup/envsetup.py 1
     python3 /root/envsetup/envsetup.py 2
-    python3 /root/envsetup/envsetup.py 4
     python3 /root/envsetup/envsetup.py 21
     python3 /root/envsetup/envsetup.py 22
+    python3 /root/envsetup/envsetup.py 4
 }
 
 monitor() {